X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cc1d4ff2a0c78666f35bbfa34fcc609d7862709..d95c5149add596d0dec940599332a24edf96dc38:/include/wx/motif/dialog.h?ds=sidebyside

diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h
index 65f3ed28f4..be53d02123 100644
--- a/include/wx/motif/dialog.h
+++ b/include/wx/motif/dialog.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dialog.h
+// Name:        wx/motif/dialog.h
 // Purpose:     wxDialog class
 // Author:      Julian Smart
 // Modified by:
@@ -12,10 +12,6 @@
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "dialog.h"
-#endif
-
 class WXDLLEXPORT wxEventLoop;
 
 // Dialog boxes
@@ -26,20 +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,
         const wxPoint& pos = wxDefaultPosition,
@@ -51,7 +33,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,20 +43,20 @@ public:
 
     virtual bool Destroy();
 
-    virtual bool Show(bool show = TRUE);
+    virtual bool Show(bool show = true);
 
     void SetTitle(const wxString& title);
 
     void SetModal(bool flag);
 
     virtual bool IsModal() const
-    { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
+    { return m_modalShowing; }
 
     virtual int ShowModal();
     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; }
@@ -92,13 +74,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;
@@ -111,6 +94,7 @@ protected:
 
     virtual void DoSetClientSize(int width, int height);
 
+
 private:
     DECLARE_EVENT_TABLE()
 };