Warning cleanup

[inkscape.git] / src / ui / dialog / dialog.h

diff --git a/src/ui/dialog/dialog.h b/src/ui/dialog/dialog.h
index 50b69caa469e574bd6aaaf7cdc7e557c5669c58c..5a9e656457e3b7138231cf17dbb1d2098dae2165 100644 (file)
--- a/src/ui/dialog/dialog.h
+++ b/src/ui/dialog/dialog.h
@@ -39,9 +39,8 @@ gboolean sp_retransientize_again(gpointer dlgPtr);
 void sp_dialog_shutdown(GtkObject *object, gpointer dlgPtr);
 
 class Dialog {
-public:
 
-    Dialog(const char *prefs_path = NULL, int verb_num = 0, const char *apply_label = NULL);
+public:
 
     Dialog(Behavior::BehaviorFactory behavior_factory, const char *prefs_path = NULL, 
            int verb_num = 0, const char *apply_label = NULL);
@@ -51,14 +50,13 @@ public:
     virtual void onDesktopActivated (SPDesktop*);
     virtual void onShutdown();
 
-    virtual void present();
-
     /** Hide and show dialogs */
     virtual void onHideF12();
     virtual void onShowF12();
 
     virtual operator Gtk::Widget&();
     virtual GtkWidget *gobj();
+    virtual void present();
     virtual Gtk::VBox *get_vbox();
     virtual void show();
     virtual void hide();
@@ -104,12 +102,14 @@ protected:
      */
     Gtk::Tooltips tooltips;
 
-    virtual void   on_response(int response_id);
-    virtual bool   on_delete_event (GdkEventAny*);
+    virtual void   _onResponse(int response_id);
+    virtual bool   _onDeleteEvent (GdkEventAny*);
+    virtual bool   _onEvent(GdkEvent *event);
+    virtual bool   _onKeyPress(GdkEventKey *event);
+
     virtual void   _apply();
     virtual void   _close();
-
-    static bool windowKeyPress(GdkEventKey *event);
+    virtual void   _defocus();
 
     Inkscape::Selection*   _getSelection();