small build fixes for PCH-less builds

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h
index 8534306a4ff7e02aaa9481b03c6af7858501c99d..3d93d7b47177153dc4b7f2c124f8b67a48e0b27f 100644 (file)
--- a/include/wx/gtk/cursor.h
+++ b/include/wx/gtk/cursor.h
@@ -11,12 +11,11 @@
 #define _WX_GTK_CURSOR_H_
 
 #include "wx/gdiobj.h"
+#include "wx/gdicmn.h"
 
 class WXDLLIMPEXP_FWD_CORE wxColour;
 class WXDLLIMPEXP_FWD_CORE wxImage;
 
-enum wxStockCursor;
-
 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------
@@ -29,10 +28,10 @@ public:
 #if wxUSE_IMAGE
     wxCursor( const wxImage & image );
 #endif
-    wxCursor( const char bits[], int width, int  height,
-              int hotSpotX=-1, int hotSpotY=-1,
+    wxCursor( const char bits[], int width, int height,
+              int hotSpotX = -1, int hotSpotY = -1,
               const char maskBits[] = NULL,
-              const wxColour *fg = NULL, const wxColour *bg = NULL );
+              const wxColour* fg = NULL, const wxColour* bg = NULL);
     virtual ~wxCursor();
 
     // implementation

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index d95667925a9ed31fd9de7f46b414de94185492f8..7a52b05e9da372469b18ae22985c7f15f66030a1 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -161,7 +161,7 @@ int wxColourDialog::ShowModal()
     // transfer the values chosen by user back into m_colourData
     for ( i = 0; i < WXSIZEOF(custColours); i++ )
     {
-      wxRGBToColour(m_colourData.GetCustomColour(i), custColours[i]);
+      wxRGBToColour(m_colourData.m_custColours[i], custColours[i]);
     }
 
     wxRGBToColour(m_colourData.GetColour(), chooseColorStruct.rgbResult);