fixed ifdef

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

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index fb131cd96ce6e89c9e41b70b98aa033c11c2b543..b594449b0304eb24b82944fddb79f98c92f96ac1 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -22,19 +22,26 @@
 class WXDLLEXPORT wxDialogBase : public wxPanel
 {
 public:
 class WXDLLEXPORT wxDialogBase : public wxPanel
 {
 public:

+#ifdef __WXMAC_X__
+    ~wxDialogBase() {}  // Added min for Mac X
+#endif

     // 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; }
 

-protected:
+#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;
 };
     // the return code from modal dialog
     int m_returnCode;
 };


@@ -45,6 +52,9 @@ protected:
     #include "wx/motif/dialog.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/dialog.h"
     #include "wx/motif/dialog.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/dialog.h"

+#elif defined(__WXMGL__)
+    #include "wx/mgl/dialog.h"
+// FIXME_MGL -- belongs to wxUniv

 #elif defined(__WXQT__)
     #include "wx/qt/dialog.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXQT__)
     #include "wx/qt/dialog.h"
 #elif defined(__WXMAC__)