Compilation fix for OS/2.

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 5ff4513ab4d610d47b611089ac462bc5d292492e..81a00606e04fd028a6c001c514aa6c68501cfe81 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
@@ -63,7 +63,7 @@ public:
     // -------------------------------
 
     // override some base class virtuals
-    virtual bool Show(bool show = TRUE);
+    virtual bool Show(bool show = true);
 
     virtual void Raise();
 
@@ -82,18 +82,13 @@ public:
     // Windows callbacks
     WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
-#if wxUSE_CTL3D
-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                                WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-#endif // wxUSE_CTL3D
-
     // obsolete methods
     // ----------------
 
     // use the other ctor
     wxDEPRECATED( wxDialog(wxWindow *parent,
              const wxString& title, bool modal,
-             int x = -1, int y= -1, int width = 500, int height = 500,
+             int x = wxDefaultCoord, int y = wxDefaultCoord, int width = 500, int height = 500,
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr) );
 
@@ -113,6 +108,9 @@ protected:
     // common part of all ctors
     void Init();
 
+    // end either modal or modeless dialog
+    void EndDialog(int rc);
+
 private:
     wxWindow*   m_oldFocus;
     bool        m_endModalCalled; // allow for closing within InitDialog