Fixed wxMessageBox with only an OK button returning wxCANCEL under MSW.

[wxWidgets.git] / src / os2 / dirdlg.cpp

diff --git a/src/os2/dirdlg.cpp b/src/os2/dirdlg.cpp
index 2938939411ced8c5ba952bec4e37acecc0f32f76..000c8f61c18b8d284efa30db6515f1d876e89450 100644 (file)
--- a/src/os2/dirdlg.cpp
+++ b/src/os2/dirdlg.cpp
@@ -1,31 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dirdlg.cpp
+// Name:        src/os2/dirdlg.cpp

 // Purpose:     wxDirDialog
 // Author:      David Webster
 // Modified by:
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Purpose:     wxDirDialog
 // Author:      David Webster
 // Modified by:
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "dirdlg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/defs.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"

 #include "wx/dirdlg.h"
 #include "wx/dirdlg.h"

+
+#ifndef WX_PRECOMP
+    #include <stdio.h>
+    #include "wx/utils.h"
+    #include "wx/dialog.h"

 #endif
 
 #include "wx/os2/private.h"
 #endif
 
 #include "wx/os2/private.h"

-#include "wx/cmndata.h"

 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>


@@ -40,7 +35,7 @@ wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
         long style, const wxPoint& pos)
 {
     m_message = message;
         long style, const wxPoint& pos)
 {
     m_message = message;

-    m_dialogStyle = style;
+    m_windowStyle = style;

     m_parent = parent;
     m_path = defaultPath;
 }
     m_parent = parent;
     m_path = defaultPath;
 }


@@ -50,4 +45,3 @@ int wxDirDialog::ShowModal()
     // TODO
     return wxID_CANCEL;
 }
     // TODO
     return wxID_CANCEL;
 }

-