MSLU with DMC build fix [#1469456].

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

diff --git a/include/wx/cocoa/dialog.h b/include/wx/cocoa/dialog.h
index d5b13e7cc638d027a1d7f2bcf08fbc081a2c3d1c..f0a8f6dda24b820a6a68f66960eeb2110964dcb1 100644 (file)
--- a/include/wx/cocoa/dialog.h
+++ b/include/wx/cocoa/dialog.h
@@ -4,7 +4,7 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/15
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -33,18 +33,19 @@ class WXDLLEXPORT wxDialog : public wxDialogBase, protected wxCocoaNSPanel
 public:
     wxDialog() { Init(); }
 
+#if WXWIN_COMPATIBILITY_2_6
     // 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,
+            const wxString& title, bool WXUNUSED(modal),
+            int x = wxDefaultCoord, int y= wxDefaultCoord, int width = 500, int height = 500,
             long style = wxDEFAULT_DIALOG_STYLE,
             const wxString& name = wxDialogNameStr)
     {
         Init();
-        long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
-        Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),
-               style | modalStyle, name);
+        Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(width, height),
+               style, name);
     }
+#endif // WXWIN_COMPATIBILITY_2_6
 
     // Constructor with no modal flag - the new convention.
     wxDialog(wxWindow *parent, wxWindowID winid,
@@ -87,7 +88,7 @@ public:
     virtual bool IsModal() const { return m_isModal; }
     bool m_isModal;
 
-    // For now, same as Show(TRUE) but returns return code
+    // For now, same as Show(true) but returns return code
     virtual int ShowModal();
 
     // may be called to terminate the dialog with the given return code