X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e1bcfa80e19ac853b8bc7084075fe3b01e63f03..ac6178d747f7b3c50a61627c65d6a73ea6dcee5b:/include/wx/motif/dialog.h

diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h
index 0e3b7980f6..9fa1cfd9c1 100644
--- a/include/wx/motif/dialog.h
+++ b/include/wx/motif/dialog.h
@@ -12,12 +12,6 @@
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
-#ifdef __GNUG__
-#pragma interface "dialog.h"
-#endif
-
-WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
-
 class WXDLLEXPORT wxEventLoop;
 
 // Dialog boxes
@@ -28,19 +22,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,
@@ -53,7 +34,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,
@@ -63,7 +44,7 @@ public:
 
     virtual bool Destroy();
 
-    virtual bool Show(bool show = TRUE);
+    virtual bool Show(bool show = true);
 
     void SetTitle(const wxString& title);
 
@@ -76,7 +57,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; }
@@ -94,13 +75,14 @@ public:
     void OnCloseWindow(wxCloseEvent& event);
 
 private:
-    virtual bool DoCreate( wxWindow* parent, wxWindowID id,
-                           const wxString& title,
-                           const wxPoint& pos,
-                           const wxSize& size,
-                           long style,
-                           const wxString& name );
-    virtual void DoDestroy();
+    virtual bool XmDoCreateTLW(wxWindow* parent,
+                               wxWindowID id,
+                               const wxString& title,
+                               const wxPoint& pos,
+                               const wxSize& size,
+                               long style,
+                               const wxString& name);
+
 
     //// Motif-specific
     bool          m_modalShowing;
@@ -113,6 +95,7 @@ protected:
 
     virtual void DoSetClientSize(int width, int height);
 
+
 private:
     DECLARE_EVENT_TABLE()
 };