Add some version checks to help compiling on OSX.

[wxWidgets.git] / src / msw / colordlg.cpp

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index f369f4762be5335c07df7cedde7eac6ae50f3cd1..788f0fae7c0a7069c5a8350c14f3f93d24a475af 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -34,8 +34,6 @@
     #include "wx/colour.h"
     #include "wx/gdicmn.h"
     #include "wx/utils.h"
     #include "wx/colour.h"
     #include "wx/gdicmn.h"
     #include "wx/utils.h"

-    #include "wx/dialog.h"
-    #include "wx/cmndata.h"

     #include "wx/math.h"
 #endif
 
     #include "wx/math.h"
 #endif
 


@@ -152,7 +150,9 @@ int wxColourDialog::ShowModal()
         // occurred
         const DWORD err = CommDlgExtendedError();
         if ( err )
         // occurred
         const DWORD err = CommDlgExtendedError();
         if ( err )

+        {

             wxLogError(_("Colour selection dialog failed with error %0lx."), err);
             wxLogError(_("Colour selection dialog failed with error %0lx."), err);

+        }

 
         return wxID_CANCEL;
     }
 
         return wxID_CANCEL;
     }