handle volume part of the path correctly in wxFileName(path, name, ext) ctor

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 5ff4513ab4d610d47b611089ac462bc5d292492e..aae10aa23edfc8e2c9f073732136fc8a974d9bfb 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
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_


@@ -63,7 +63,7 @@ public:
     // -------------------------------
 
     // override some base class virtuals
     // -------------------------------
 
     // override some base class virtuals

-    virtual bool Show(bool show = TRUE);
+    virtual bool Show(bool show = true);

 
     virtual void Raise();
 
 
     virtual void Raise();
 


@@ -93,7 +93,7 @@ public:
     // use the other ctor
     wxDEPRECATED( wxDialog(wxWindow *parent,
              const wxString& title, bool modal,
     // 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) );
 
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr) );
 


@@ -113,6 +113,9 @@ protected:
     // common part of all ctors
     void Init();
 
     // 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
 private:
     wxWindow*   m_oldFocus;
     bool        m_endModalCalled; // allow for closing within InitDialog