wxGTK1 : wx/private/eventloopsourcesmanager.h was missing in evtloop.cpp

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

diff --git a/src/os2/dirdlg.cpp b/src/os2/dirdlg.cpp
index 1dd38fa43a2d9701d976b3dc5b42ee35dd3c66ec..fcaf7a87c914e078dfe6c585f1584ce0f4a25453 100644 (file)
--- a/src/os2/dirdlg.cpp
+++ b/src/os2/dirdlg.cpp
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxDirDialog
 // Author:      David Webster
 // Modified by:
 // Created:     10/14/99
 // Purpose:     wxDirDialog
 // Author:      David Webster
 // Modified by:
 // Created:     10/14/99

-// RCS-ID:      $Id$

 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,41 +11,39 @@
 // 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"

+#include "wx/modalhook.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 <math.h>

 #include <stdlib.h>
 #include <string.h>
 
 #define wxDIALOG_DEFAULT_X 300
 #define wxDIALOG_DEFAULT_Y 300
 
 #include <stdlib.h>
 #include <string.h>
 
 #define wxDIALOG_DEFAULT_X 300
 #define wxDIALOG_DEFAULT_Y 300
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)

-#endif

 
 wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
         const wxString& defaultPath,
         long style, const wxPoint& pos)
 {
     m_message = message;
 
 wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
         const wxString& defaultPath,
         long style, const wxPoint& pos)
 {
     m_message = message;

-    m_dialogStyle = style;
+    m_windowStyle = style;

     m_parent = parent;
     m_path = defaultPath;
 }
 
 int wxDirDialog::ShowModal()
 {
     m_parent = parent;
     m_path = defaultPath;
 }
 
 int wxDirDialog::ShowModal()
 {

+    WX_HOOK_MODAL_DIALOG();
+

     // TODO
     return wxID_CANCEL;
 }
     // TODO
     return wxID_CANCEL;
 }

-