compilation/build fixes for wxUniv

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

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index a693f638ae4631171ae0d2f77633a08e215b2ccb..cfab0663ad72c34446e5f527e8a005428cd51c9d 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -17,45 +17,67 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

-#include "wx/panel.h"
+#include "wx/containr.h"
+#include "wx/toplevel.h"

 
 

+// FIXME - temporary hack in absence of wxTLW !!
+#ifndef wxTopLevelWindowNative
+#include "wx/panel.h"

 class WXDLLEXPORT wxDialogBase : public wxPanel
 class WXDLLEXPORT wxDialogBase : public wxPanel

+#else
+class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
+#endif

 {
 public:
 {
 public:

-#ifdef __WXMAC_X__
-    ~wxDialogBase() {}  // Added min for Mac X
-#endif
+    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; }
 
     // 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; }
 

+#if wxUSE_STATTEXT && wxUSE_TEXTCTRL

     // splits text up at newlines and places the
     // lines into a vertical wxBoxSizer
     wxSizer *CreateTextSizer( const wxString &message );
     // 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 );
     // places buttons into a horizontal wxBoxSizer
     wxSizer *CreateButtonSizer( long flags );

+#endif // wxUSE_BUTTON

 
 protected:
     // the return code from modal dialog
     int m_returnCode;
 
 protected:
     // the return code from modal dialog
     int m_returnCode;

+
+    // FIXME - temporary hack in absence of wxTLW !!
+#ifdef wxTopLevelWindowNative
+    DECLARE_EVENT_TABLE()
+    WX_DECLARE_CONTROL_CONTAINER();
+#endif

 };
 
 };
 

-#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__)
+    #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(__WXPM__)
+        #include "wx/os2/dialog.h"
+    #elif defined(__WXSTUBS__)
+        #include "wx/stubs/dialog.h"
+    #endif

 #endif
 
 #endif
 #endif
 
 #endif