Merge from default. Hope I did it right...

This commit is contained in:
Emil Martinec
2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions

View File

@@ -39,13 +39,17 @@ class Splash : public Gtk::Dialog {
private:
SplashImage* splashImage;
Gtk::Notebook* nb;
Gtk::ScrolledWindow* releaseNotesSW;
public:
Splash (int maxtime);
Splash ();
Splash (Gtk::Window& parent, int maxtime);
Splash (Gtk::Window& parent);
bool hasReleaseNotes() { return releaseNotesSW != NULL; };
void showReleaseNotes();
bool on_timer ();
virtual bool on_button_release_event (GdkEventButton* event);
//virtual bool on_button_release_event (GdkEventButton* event);
};
#endif