X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03e11df5470fd64d9d9a669d0b50b84c2d714736..2b004197c8cea40b41632e86cf27857463f985b8:/include/wx/dialog.h?ds=sidebyside

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index a693f638ae..c96c015e73 100644
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -22,20 +22,24 @@
 class WXDLLEXPORT wxDialogBase : public wxPanel
 {
 public:
-#ifdef __WXMAC_X__
-    ~wxDialogBase() {}  // Added min for Mac X
+#ifdef __DARWIN__
+    ~wxDialogBase() { }
 #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; }
 
+#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
@@ -48,6 +52,9 @@ protected:
     #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__)