Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

small build fixes for PCH-less builds

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-09-25 09:56:22 +00:00
parent fc39cf7295
commit f4efd805a0
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/gtk/cursor.h
View File

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

2
src/msw/colordlg.cpp
View File

@@ -161,7 +161,7 @@ int wxColourDialog::ShowModal()
// transfer the values chosen by user back into m_colourData // transfer the values chosen by user back into m_colourData
for ( i = 0; i < WXSIZEOF(custColours); i++ ) 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); wxRGBToColour(m_colourData.GetColour(), chooseColorStruct.rgbResult);