X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92afa2b150803da84a4bc7dfa4e580dbbff15c9a..1b8865e92caa043cf31043e38a788d8d4a9286e0:/include/wx/dialog.h

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index ac5f9a9672..fe3959626e 100644
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -12,43 +12,66 @@
 #ifndef _WX_DIALOG_H_BASE_
 #define _WX_DIALOG_H_BASE_
 
+#if defined(__GNUG__) && !defined(__APPLE__)
+    #pragma interface "dialogbase.h"
+#endif
+
 #include "wx/defs.h"
-#include "wx/panel.h"
+#include "wx/containr.h"
+#include "wx/toplevel.h"
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 
-class WXDLLEXPORT wxDialogBase : public wxPanel
+class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
 {
 public:
+    wxDialogBase() { Init(); }
+    virtual ~wxDialogBase() { }
+
+    void Init();
+
     // the modal dialogs have a return code - usually the id of the last
     // pressed button
     void SetReturnCode(int returnCode) { m_returnCode = returnCode; }
     int GetReturnCode() const { return m_returnCode; }
 
-protected:
+#if wxUSE_STATTEXT // && wxUSE_TEXTCTRL
     // splits text up at newlines and places the
     // lines into a vertical wxBoxSizer
     wxSizer *CreateTextSizer( const wxString &message );
-    
+#endif // wxUSE_STATTEXT // && wxUSE_TEXTCTRL
+
+#if wxUSE_BUTTON
     // places buttons into a horizontal wxBoxSizer
     wxSizer *CreateButtonSizer( long flags );
+#endif // wxUSE_BUTTON
 
+protected:
     // the return code from modal dialog
     int m_returnCode;
+
+    DECLARE_NO_COPY_CLASS(wxDialogBase)
+    DECLARE_EVENT_TABLE()
+    WX_DECLARE_CONTROL_CONTAINER();
 };
 
-#if defined(__WXMSW__)
-    #include "wx/msw/dialog.h"
-#elif defined(__WXMOTIF__)
-    #include "wx/motif/dialog.h"
-#elif defined(__WXGTK__)
-    #include "wx/gtk/dialog.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/dialog.h"
-#elif defined(__WXMAC__)
-    #include "wx/mac/dialog.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/dialog.h"
-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/dialog.h"
+
+#if defined(__WXUNIVERSAL__) && !defined(__WXMICROWIN__)
+    #include "wx/univ/dialog.h"
+#else
+    #if defined(__WXMSW__)
+        #include "wx/msw/dialog.h"
+    #elif defined(__WXMOTIF__)
+        #include "wx/motif/dialog.h"
+    #elif defined(__WXGTK__)
+        #include "wx/gtk/dialog.h"
+    #elif defined(__WXMAC__)
+        #include "wx/mac/dialog.h"
+    #elif defined(__WXCOCOA__)
+        #include "wx/cocoa/dialog.h"
+    #elif defined(__WXPM__)
+        #include "wx/os2/dialog.h"
+    #endif
 #endif
 
 #endif