From f4efd805a09f66a9b0213bd8d602f773289fadeb Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Thu, 25 Sep 2008 09:56:22 +0000 Subject: [PATCH] small build fixes for PCH-less builds git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/cursor.h | 9 ++++----- src/msw/colordlg.cpp | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h index 8534306a4f..3d93d7b471 100644 --- 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 d95667925a..7a52b05e9d 100644 --- 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); -- 2.45.2