create stock GDI objects on demand; use const with GDI objects appropriately (patch 1445355)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -128,7 +128,7 @@ extern GtkWidget *wxGetRootWindow();
|
||||
|
||||
wxCursor::wxCursor(const char bits[], int width, int height,
|
||||
int hotSpotX, int hotSpotY,
|
||||
const char maskBits[], wxColour *fg, wxColour *bg)
|
||||
const char maskBits[], const wxColour *fg, const wxColour *bg)
|
||||
{
|
||||
if (!maskBits)
|
||||
maskBits = bits;
|
||||
@@ -364,7 +364,7 @@ void wxEndBusyCursor()
|
||||
wxTheApp->ProcessIdle();
|
||||
}
|
||||
|
||||
void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
|
||||
void wxBeginBusyCursor( const wxCursor *WXUNUSED(cursor) )
|
||||
{
|
||||
if (gs_busyCount++ > 0)
|
||||
return;
|
||||
|
||||
@@ -3928,7 +3928,7 @@ void wxWindowGTK::DoCaptureMouse()
|
||||
|
||||
wxCHECK_RET( window, _T("CaptureMouse() failed") );
|
||||
|
||||
wxCursor* cursor = & m_cursor;
|
||||
const wxCursor* cursor = &m_cursor;
|
||||
if (!cursor->Ok())
|
||||
cursor = wxSTANDARD_CURSOR;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user