no changes, just remove #if'd out code

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

diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 8bf37778eefeb8819afd969968d6cf3c0057268c..5023f7db67ccbceea85a2cf89b3884013e2fa3f8 100644 (file)
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -11,19 +11,7 @@
 #ifndef __GTKDIALOGH__
 #define __GTKDIALOGH__
 
 #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
 
 //-----------------------------------------------------------------------------
 // wxDialog


@@ -45,7 +33,7 @@ public:
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
             const wxString &name = wxDialogNameStr );
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
             const wxString &name = wxDialogNameStr );

-    ~wxDialog() {}
+    virtual ~wxDialog();

 
     virtual bool Show( bool show = TRUE );
     virtual int ShowModal();
 
     virtual bool Show( bool show = TRUE );
     virtual int ShowModal();


@@ -61,7 +49,7 @@ public:
 private:
     // common part of all ctors
     void Init();
 private:
     // common part of all ctors
     void Init();

-
+    wxGUIEventLoop *m_modalLoop;

     DECLARE_DYNAMIC_CLASS(wxDialog)
 };
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
 };