X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cc1d4ff2a0c78666f35bbfa34fcc609d7862709..924b84ab9461c95cf5c5386d1091ae0f7a8e7ce7:/include/wx/motif/dialog.h

diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h
index 65f3ed28f4..861062d819 100644
--- a/include/wx/motif/dialog.h
+++ b/include/wx/motif/dialog.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "dialog.h"
 #endif
 
@@ -26,19 +26,6 @@ class WXDLLEXPORT wxDialog : public wxDialogBase
 public:
     wxDialog();
 
-#if WXWIN_COMPATIBILITY_2
-    // Constructor with a modal flag, but no window id - the old convention
-    wxDialog(wxWindow *parent,
-        const wxString& title, bool modal,
-        int x = -1, int y= -1, int width = 500, int height = 500,
-        long style = wxDEFAULT_DIALOG_STYLE,
-        const wxString& name = wxDialogNameStr)
-    {
-        long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
-        Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), style|modalStyle, name);
-    }
-#endif
-
     // Constructor with no modal flag - the new convention.
     wxDialog(wxWindow *parent, wxWindowID id,
         const wxString& title,
@@ -51,7 +38,7 @@ public:
     }
 
     bool Create(wxWindow *parent, wxWindowID id,
-        const wxString& title, // bool modal = FALSE, // TODO make this a window style?
+        const wxString& title,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxDEFAULT_DIALOG_STYLE,
@@ -61,7 +48,7 @@ public:
 
     virtual bool Destroy();
 
-    virtual bool Show(bool show = TRUE);
+    virtual bool Show(bool show = true);
 
     void SetTitle(const wxString& title);
 
@@ -74,7 +61,7 @@ public:
     virtual void EndModal(int retCode);
 
     // Implementation
-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
+    virtual void ChangeFont(bool keepOriginalSize = true);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     inline WXWidget GetTopWidget() const { return m_mainWidget; }