do use the font in DoGetTextExtent()

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

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index b7bbd4fb773722977fb9a59face6a7461bd8f42c..66a70b0eb50d13a9d172cfc3057c201580d47913 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "colordlg.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"
 


@@ -28,31 +24,23 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
+
+#include "wx/colordlg.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/msw/wrapcdlg.h"

     #include <stdio.h>
     #include <stdio.h>

-    #include "wx/defs.h"
-    #include "wx/bitmap.h"
-    #include "wx/pen.h"
-    #include "wx/brush.h"

     #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/frame.h"

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

-    #include "wx/msgdlg.h"
+    #include "wx/cmndata.h"
+    #include "wx/math.h"

 #endif
 
 #endif
 

-#if wxUSE_COLOURDLG && !defined(__SMARTPHONE__)
-

 #include "wx/msw/private.h"
 #include "wx/msw/private.h"

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

 
 

-#if !defined(__WIN32__) || defined(__WXWINCE__)
-    #include <commdlg.h>
-#endif
-
-#include <math.h>

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


@@ -117,7 +105,7 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
     if (data)
         m_colourData = *data;
 
     if (data)
         m_colourData = *data;
 

-    return TRUE;
+    return true;

 }
 
 int wxColourDialog::ShowModal()
 }
 
 int wxColourDialog::ShowModal()


@@ -201,10 +189,10 @@ void wxColourDialog::DoSetSize(int x, int y,
                                int WXUNUSED(width), int WXUNUSED(height),
                                int WXUNUSED(sizeFlags))
 {
                                int WXUNUSED(width), int WXUNUSED(height),
                                int WXUNUSED(sizeFlags))
 {

-    if ( x != -1 )
+    if ( x != wxDefaultCoord )

         m_pos.x = x;
 
         m_pos.x = x;
 

-    if ( y != -1 )
+    if ( y != wxDefaultCoord )

         m_pos.y = y;
 
     // ignore the size params - we can't change the size of a standard dialog
         m_pos.y = y;
 
     // ignore the size params - we can't change the size of a standard dialog


@@ -231,4 +219,4 @@ void wxColourDialog::DoGetClientSize(int *width, int *height) const
         *height = 299;
 }
 
         *height = 299;
 }
 

-#endif
+#endif // wxUSE_COLOURDLG && !(__SMARTPHONE__ && __WXWINCE__)