* Fix logical error in m_overflow attribute merging

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

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index 4466b024f4584736cbf7370aaecb15eeef9f13d0..ea313873c3e70b26cdc3e8e6fe826236f6190646 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -42,6 +42,8 @@
     #include "wx/msgdlg.h"
 #endif
 
+#if wxUSE_COLOURDLG
+
 #include <windows.h>
 
 #if !defined(__WIN32__) || defined(__SALFORDC__)
@@ -226,3 +228,4 @@ void wxColourDialog::DoGetClientSize(int *width, int *height) const
         *height = 299;
 }
 
+#endif