From c8326d649c00a47d3e77770a8e0a0a3b7ead56bb Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 22 May 2006 07:11:26 +0000 Subject: [PATCH] Include wx/cursor.h according to precompiled headers of wx/wx.h (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/cocoa/cursor.mm | 106 ++++++++++++++++++++-------------------- src/common/gdicmn.cpp | 2 +- src/gtk/data.cpp | 3 +- src/gtk/dialog.cpp | 2 +- src/gtk/popupwin.cpp | 3 +- src/gtk1/data.cpp | 3 +- src/gtk1/dialog.cpp | 2 +- src/gtk1/popupwin.cpp | 5 +- src/mac/carbon/app.cpp | 2 +- src/mac/classic/app.cpp | 2 +- src/mgl/data.cpp | 4 +- src/msw/cursor.cpp | 11 +++-- src/os2/cursor.cpp | 3 +- src/palmos/cursor.cpp | 7 ++- src/x11/utils.cpp | 2 +- 15 files changed, 78 insertions(+), 79 deletions(-) diff --git a/src/cocoa/cursor.mm b/src/cocoa/cursor.mm index 347587794f..23d5be6cbb 100644 --- a/src/cocoa/cursor.mm +++ b/src/cocoa/cursor.mm @@ -1,18 +1,20 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cursor.mm +// Name: src/cocoa/cursor.mm // Purpose: wxCursor class for wxCocoa // Author: Ryan Norton // Modified by: // Created: 2004-10-05 // RCS-ID: $Id$ // Copyright: (c) Ryan Norton -// Licence: wxWidgets licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + +#include "wx/cursor.h" + #ifndef WX_PRECOMP #include "wx/icon.h" - #include "wx/cursor.h" #endif //WX_PRECOMP #import @@ -174,39 +176,39 @@ NSCursor* wxGetStockCursor( short sIndex ) { ClassicCursor* pCursor = &gMacCursors[sIndex]; - //Classic mac cursors are 1bps 16x16 black and white with a + //Classic mac cursors are 1bps 16x16 black and white with a //identical mask that is 1 for on and 0 for off NSImage *theImage = [[NSImage alloc] initWithSize:NSMakeSize(16.0,16.0)]; - + //NSCursor takes an NSImage takes a number of Representations - here //we need only one for the raw data - NSBitmapImageRep *theRep = - [[NSBitmapImageRep alloc] + NSBitmapImageRep *theRep = + [[NSBitmapImageRep alloc] initWithBitmapDataPlanes: nil // Allocate the buffer for us :) - pixelsWide: 16 + pixelsWide: 16 pixelsHigh: 16 bitsPerSample: 1 - samplesPerPixel: 2 - hasAlpha: YES // Well, more like a mask... - isPlanar: NO + samplesPerPixel: 2 + hasAlpha: YES // Well, more like a mask... + isPlanar: NO colorSpaceName: NSCalibratedWhiteColorSpace // Normal B/W - 0 black 1 white bytesPerRow: 0 // I don't care - figure it out for me :) bitsPerPixel: 2]; // bitsPerSample * samplesPerPixel - + //unsigned int is better to put data in then a void* //note that working with bitfields would be a lot better here - //but since it breaks some compilers... - wxUint32 *data = (wxUint32 *)[theRep bitmapData]; - + wxUint32 *data = (wxUint32 *)[theRep bitmapData]; + //traverse through the bitmap data for (int i = 0; i < 16; ++i) { //bit alpha bit alpha ... :D - - //Notice the = instead of |= - + + //Notice the = instead of |= - //this is to avoid doing a memset earlier data[i] = 0; - + //do the rest of those bits and alphas :) for (int shift = 0; shift < 32; ++shift) { @@ -217,19 +219,19 @@ NSCursor* wxGetStockCursor( short sIndex ) //add the representation (data) to the image [theImage addRepresentation:theRep]; - + //create the new cursor - NSCursor* theCursor = [[NSCursor alloc] initWithImage:theImage + NSCursor* theCursor = [[NSCursor alloc] initWithImage:theImage hotSpot:NSMakePoint(pCursor->hotspot[1], pCursor->hotspot[0]) ]; - + //do the usual cleanups - [theRep release]; + [theRep release]; [theImage release]; - + //return the new cursor return theCursor; -} +} wxCursorRefData::wxCursorRefData() : m_width(32), m_height(32), m_hCursor(nil) @@ -250,34 +252,33 @@ wxCursor::wxCursor() wxCursor::wxCursor(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY), const char WXUNUSED(maskBits)[]) { - } wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int hotSpotY) { m_refData = new wxCursorRefData; - + //TODO: Not sure if this works or not NSImage* theImage; - + if (flags & wxBITMAP_TYPE_MACCURSOR_RESOURCE) { //[NSBundle bundleForClass:[self class]]? - theImage = [[NSImage alloc] + theImage = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:wxNSStringWithWxString(cursor_file) ofType:nil] ]; - + } - else + else theImage = [[NSImage alloc] initByReferencingFile:wxNSStringWithWxString(cursor_file) ]; - + wxASSERT(theImage); - + M_CURSORDATA->m_hCursor = [[NSCursor alloc] initWithImage:theImage hotSpot:NSMakePoint(hotSpotX, hotSpotY) ]; - + [theImage release]; } @@ -294,7 +295,7 @@ wxCursor::wxCursor(int cursor_type) case wxCURSOR_ARROW: M_CURSORDATA->m_hCursor = [[NSCursor arrowCursor] retain]; break; -/* TODO: +/* TODO: case wxCURSOR_COPY_ARROW: M_CURSORDATA->m_themeCursor = kThemeCopyArrowCursor ; break; @@ -315,7 +316,7 @@ wxCursor::wxCursor(int cursor_type) M_CURSORDATA->m_hCursor = wxGetStockCursor(kwxCursorSizeNESW); } break; -/* TODO: +/* TODO: case wxCURSOR_SIZEWE: { M_CURSORDATA->m_themeCursor = kThemeResizeLeftRightCursor; @@ -332,7 +333,7 @@ wxCursor::wxCursor(int cursor_type) M_CURSORDATA->m_hCursor = wxGetStockCursor(kwxCursorSize); } break; -/* TODO: +/* TODO: case wxCURSOR_HAND: { M_CURSORDATA->m_themeCursor = kThemePointingHandCursor; @@ -426,33 +427,32 @@ static int wxBusyCursorCount = 0; // Set the cursor to the busy cursor for all windows void wxBeginBusyCursor(const wxCursor *cursor) { - wxBusyCursorCount ++; - if (wxBusyCursorCount == 1) - { + wxBusyCursorCount ++; + if (wxBusyCursorCount == 1) + { // TODO - } - else - { + } + else + { // TODO - } + } } // Restore cursor to normal void wxEndBusyCursor() { - if (wxBusyCursorCount == 0) - return; - - wxBusyCursorCount --; - if (wxBusyCursorCount == 0) - { - // TODO - } + if (wxBusyCursorCount == 0) + return; + + wxBusyCursorCount --; + if (wxBusyCursorCount == 0) + { + // TODO + } } -// TRUE if we're between the above two calls +// true if we're between the above two calls bool wxIsBusy() { return (wxBusyCursorCount > 0); -} - +} diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 7e869fb82e..a4820ae147 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -32,10 +32,10 @@ #include "wx/brush.h" #include "wx/palette.h" #include "wx/icon.h" + #include "wx/cursor.h" #endif #include "wx/bitmap.h" -#include "wx/cursor.h" #include "wx/font.h" #include "wx/settings.h" #include "wx/hashmap.h" diff --git a/src/gtk/data.cpp b/src/gtk/data.cpp index 8e47f28a70..c4396ae97a 100644 --- a/src/gtk/data.cpp +++ b/src/gtk/data.cpp @@ -14,10 +14,9 @@ #include "wx/object.h" #include "wx/window.h" #include "wx/dc.h" + #include "wx/cursor.h" #endif -#include "wx/cursor.h" - /* Current cursor, in order to hang on to * cursor handle when setting the cursor globally */ wxCursor g_globalCursor; diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp index 81c8bc6249..ff269131bd 100644 --- a/src/gtk/dialog.cpp +++ b/src/gtk/dialog.cpp @@ -15,9 +15,9 @@ #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/frame.h" + #include "wx/cursor.h" #endif // WX_PRECOMP -#include "wx/cursor.h" #include "wx/evtloop.h" #include diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp index 843144ebaa..98bb95953f 100644 --- a/src/gtk/popupwin.cpp +++ b/src/gtk/popupwin.cpp @@ -17,10 +17,9 @@ #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/frame.h" + #include "wx/cursor.h" #endif // WX_PRECOMP -#include "wx/cursor.h" - #include #include #include diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp index 7b1409e98b..f1f49656b8 100644 --- a/src/gtk1/data.cpp +++ b/src/gtk1/data.cpp @@ -14,10 +14,9 @@ #include "wx/object.h" #include "wx/window.h" #include "wx/dc.h" + #include "wx/cursor.h" #endif -#include "wx/cursor.h" - /* Current cursor, in order to hang on to * cursor handle when setting the cursor globally */ wxCursor g_globalCursor; diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp index a58dcb55db..67f0984c08 100644 --- a/src/gtk1/dialog.cpp +++ b/src/gtk1/dialog.cpp @@ -15,9 +15,9 @@ #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/frame.h" + #include "wx/cursor.h" #endif // WX_PRECOMP -#include "wx/cursor.h" #include "wx/evtloop.h" #include diff --git a/src/gtk1/popupwin.cpp b/src/gtk1/popupwin.cpp index 65d35e5c22..77c4044882 100644 --- a/src/gtk1/popupwin.cpp +++ b/src/gtk1/popupwin.cpp @@ -17,10 +17,9 @@ #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/frame.h" + #include "wx/cursor.h" #endif // WX_PRECOMP -#include "wx/cursor.h" - #include #include #include @@ -221,7 +220,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style ) gtk_signal_connect (GTK_OBJECT(m_widget), "button_press_event", GTK_SIGNAL_FUNC(gtk_popup_button_press), (gpointer)this ); - return TRUE; + return true; } void wxPopupWindow::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) ) diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index ec64c3fb06..3f0b8919f7 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -26,10 +26,10 @@ #include "wx/brush.h" #include "wx/palette.h" #include "wx/icon.h" + #include "wx/cursor.h" #endif #include "wx/gdicmn.h" -#include "wx/cursor.h" #include "wx/dialog.h" #include "wx/msgdlg.h" #include "wx/module.h" diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp index 6d83aedb22..dd8817b49a 100644 --- a/src/mac/classic/app.cpp +++ b/src/mac/classic/app.cpp @@ -30,10 +30,10 @@ #include "wx/brush.h" #include "wx/palette.h" #include "wx/icon.h" + #include "wx/cursor.h" #endif #include "wx/gdicmn.h" -#include "wx/cursor.h" #include "wx/dialog.h" #include "wx/msgdlg.h" #include "wx/module.h" diff --git a/src/mgl/data.cpp b/src/mgl/data.cpp index 1fb6225976..ef34e4118d 100644 --- a/src/mgl/data.cpp +++ b/src/mgl/data.cpp @@ -14,7 +14,9 @@ #pragma hdrstop #endif -#include "wx/cursor.h" +#ifndef WX_PRECOMP + #include "wx/cursor.h" +#endif /* Current cursor, in order to hang on to * cursor handle when setting the cursor globally */ diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index 3a6a3e9e80..b50ffa1052 100644 --- a/src/msw/cursor.cpp +++ b/src/msw/cursor.cpp @@ -24,12 +24,13 @@ #pragma hdrstop #endif +#include "wx/cursor.h" + #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/app.h" #include "wx/bitmap.h" #include "wx/icon.h" - #include "wx/cursor.h" #include "wx/settings.h" #include "wx/intl.h" #endif @@ -217,7 +218,7 @@ wxCursor::wxCursor(const wxImage& image) } #else HCURSOR hcursor = 0; -#endif +#endif m_refData = new wxCursorRefData(hcursor, true /* delete it later */); } @@ -313,7 +314,7 @@ wxCursor::wxCursor(int idCursor) { false, _T("WXCURSOR_RIGHT_ARROW") }, // wxCURSOR_RIGHT_ARROW { false, _T("WXCURSOR_BULLSEYE") }, // wxCURSOR_BULLSEYE { true, IDC_ARROW }, // WXCURSOR_CHAR - + // Displays as an I-beam on XP, so use a cursor file // { true, IDC_CROSS }, // WXCURSOR_CROSS { false, _T("WXCURSOR_CROSS") }, // WXCURSOR_CROSS @@ -321,7 +322,7 @@ wxCursor::wxCursor(int idCursor) // See special handling below for wxCURSOR_HAND // { false, _T("WXCURSOR_HAND") }, // wxCURSOR_HAND { true, IDC_HAND }, // wxCURSOR_HAND - + { true, IDC_IBEAM }, // WXCURSOR_IBEAM { true, IDC_ARROW }, // WXCURSOR_LEFT_BUTTON { false, _T("WXCURSOR_MAGNIFIER") }, // wxCURSOR_MAGNIFIER @@ -365,7 +366,7 @@ wxCursor::wxCursor(int idCursor) hcursor = ::LoadCursor(wxGetInstance(), _T("WXCURSOR_HAND")); deleteLater = true; } - + if ( !hcursor ) { wxLogLastError(_T("LoadCursor")); diff --git a/src/os2/cursor.cpp b/src/os2/cursor.cpp index ebbb30b741..fec983bf60 100644 --- a/src/os2/cursor.cpp +++ b/src/os2/cursor.cpp @@ -12,12 +12,13 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/cursor.h" + #ifndef WX_PRECOMP #include #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" - #include "wx/cursor.h" #include "wx/icon.h" #endif diff --git a/src/palmos/cursor.cpp b/src/palmos/cursor.cpp index 51368d9ab3..de3a5ef231 100644 --- a/src/palmos/cursor.cpp +++ b/src/palmos/cursor.cpp @@ -24,12 +24,13 @@ #pragma hdrstop #endif +#include "wx/cursor.h" + #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/app.h" #include "wx/bitmap.h" #include "wx/icon.h" - #include "wx/cursor.h" #include "wx/settings.h" #include "wx/intl.h" #endif @@ -110,7 +111,7 @@ wxCursor::~wxCursor() bool wxCursor::operator==(const wxCursor& cursor) const { - return FALSE; + return false; } wxGDIImageRefData *wxCursor::CreateData() const @@ -130,5 +131,3 @@ const wxCursor *wxGetGlobalCursor() void wxSetCursor(const wxCursor& cursor) { } - - diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp index aa03ce8a5b..8982ec4c0e 100644 --- a/src/x11/utils.cpp +++ b/src/x11/utils.cpp @@ -29,11 +29,11 @@ #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/window.h" // for wxTopLevelWindows + #include "wx/cursor.h" #endif #include "wx/apptrait.h" #include "wx/msgdlg.h" -#include "wx/cursor.h" #include #include -- 2.45.2