wrong move

[wxWidgets.git] / include / wx / gtk / dialog.h

diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 2ae06386823340820b85f6e151273c21cf1587e2..5023f7db67ccbceea85a2cf89b3884013e2fa3f8 100644 (file)
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -11,19 +11,7 @@
 #ifndef __GTKDIALOGH__
 #define __GTKDIALOGH__
 
-#include "wx/defs.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDialog;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern WXDLLIMPEXP_CORE const wxChar *wxDialogNameStr;
+class WXDLLIMPEXP_FWD_CORE wxGUIEventLoop;
 
 //-----------------------------------------------------------------------------
 // wxDialog
@@ -45,16 +33,7 @@ public:
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
             const wxString &name = wxDialogNameStr );
-    ~wxDialog() {}
-
-    void OnApply( wxCommandEvent &event );
-    void OnCancel( wxCommandEvent &event );
-    void OnOK( wxCommandEvent &event );
-    void OnPaint( wxPaintEvent& event );
-    void OnCloseWindow( wxCloseEvent& event );
-    /*
-       void OnCharHook( wxKeyEvent& event );
-     */
+    virtual ~wxDialog();
 
     virtual bool Show( bool show = TRUE );
     virtual int ShowModal();
@@ -67,12 +46,10 @@ public:
 
     bool       m_modalShowing;
 
-protected:
+private:
     // common part of all ctors
     void Init();
-
-private:
-    DECLARE_EVENT_TABLE()
+    wxGUIEventLoop *m_modalLoop;
     DECLARE_DYNAMIC_CLASS(wxDialog)
 };