Fixes for the DLL build

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

diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp
index c9705d8ea44c97e3d0214a57b4c4d3df5b66b5fc..99e6b11d2c9b3ca5e06b4bfe718217650d7bf16c 100644 (file)
--- a/src/os2/dialog.cpp
+++ b/src/os2/dialog.cpp
@@ -12,18 +12,18 @@
 // 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 "wx/dialog.h"
 #include "wx/dialog.h"

-#include "wx/utils.h"
-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/settings.h"
-#include "wx/intl.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/frame.h"
+    #include "wx/app.h"
+    #include "wx/settings.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"

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

-#include "wx/log.h"

 #include "wx/evtloop.h"
 #include "wx/ptr_scpd.h"
 
 #include "wx/evtloop.h"
 #include "wx/ptr_scpd.h"
 


@@ -130,6 +130,8 @@ bool wxDialog::Create( wxWindow*       pParent,
     return true;
 } // end of wxDialog::Create
 
     return true;
 } // end of wxDialog::Create
 

+#if WXWIN_COMPATIBILITY_2_6
+

 // deprecated ctor
 wxDialog::wxDialog(wxWindow *parent,
                    const wxString& title,
 // deprecated ctor
 wxDialog::wxDialog(wxWindow *parent,
                    const wxString& title,


@@ -146,13 +148,13 @@ wxDialog::wxDialog(wxWindow *parent,
     Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);
 }
 
     Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);
 }
 

-void wxDialog::SetModal(
-  bool                              WXUNUSED(bFlag)
-)
+void wxDialog::SetModal(bool WXUNUSED(bFlag))

 {
     // nothing to do, obsolete method
 } // end of wxDialog::SetModal
 
 {
     // nothing to do, obsolete method
 } // end of wxDialog::SetModal
 

+#endif // WXWIN_COMPATIBILITY_2_6
+

 wxDialog::~wxDialog()
 {
     m_isBeingDeleted = true;
 wxDialog::~wxDialog()
 {
     m_isBeingDeleted = true;


@@ -199,11 +201,14 @@ void wxDialog::OnCharHook(
 // showing the dialogs
 // ----------------------------------------------------------------------------
 
 // showing the dialogs
 // ----------------------------------------------------------------------------
 

+#if WXWIN_COMPATIBILITY_2_6
+

 bool wxDialog::IsModalShowing() const
 {
     return IsModal();
 } // end of wxDialog::IsModalShowing
 
 bool wxDialog::IsModalShowing() const
 {
     return IsModal();
 } // end of wxDialog::IsModalShowing
 

+#endif // WXWIN_COMPATIBILITY_2_6

 
 wxWindow *wxDialog::FindSuitableParent() const
 {
 
 wxWindow *wxDialog::FindSuitableParent() const
 {


@@ -266,7 +271,7 @@ bool wxDialog::Show( bool bShow )
     if ( bShow )
     {
         // dialogs don't get WM_SIZE message after creation unlike most (all?)
     if ( bShow )
     {
         // dialogs don't get WM_SIZE message after creation unlike most (all?)

-        // other windows and so could start their life non laid out correctly
+        // other windows and so could start their life not laid out correctly

         // if we didn't call Layout() from here
         //
         // NB: normally we should call it just the first time but doing it
         // if we didn't call Layout() from here
         //
         // NB: normally we should call it just the first time but doing it