diff --git a/include/wx/msw/uxtheme.h b/include/wx/msw/uxtheme.h index 62f9cf88ee..83393c6c57 100644 --- a/include/wx/msw/uxtheme.h +++ b/include/wx/msw/uxtheme.h @@ -56,7 +56,7 @@ #endif #ifndef TMT_FONT -#define TMT_FONT 210 +#define TMT_FONT 210 #endif #ifndef HAVE_VSSYM32 diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc index 44a33c0886..732793c197 100644 --- a/include/wx/msw/wx.rc +++ b/include/wx/msw/wx.rc @@ -25,7 +25,7 @@ BEGIN MENUITEM "&Cascade", 4002 MENUITEM "Tile &Horizontally", 4001 MENUITEM "Tile &Vertically", 4005 - MENUITEM "", -1 + MENUITEM "", -1 MENUITEM "&Arrange Icons", 4003 MENUITEM "&Next", 4004 END diff --git a/include/wx/x11/nanox/X11/Xlib.h b/include/wx/x11/nanox/X11/Xlib.h index 0e3aed4d23..f1ebf6fb5e 100644 --- a/include/wx/x11/nanox/X11/Xlib.h +++ b/include/wx/x11/nanox/X11/Xlib.h @@ -26,12 +26,12 @@ typedef struct { GR_FONT_ID fid; } XFontStruct; typedef struct { - short lbearing; /* origin to left edge of raster */ - short rbearing; /* origin to right edge of raster */ - short width; /* advance to next char's origin */ - short ascent; /* baseline to top edge of raster */ - short descent; /* baseline to bottom edge of raster */ - unsigned short attributes; /* per char flags (not predefined) */ + short lbearing; /* origin to left edge of raster */ + short rbearing; /* origin to right edge of raster */ + short width; /* advance to next char's origin */ + short ascent; /* baseline to top edge of raster */ + short descent; /* baseline to bottom edge of raster */ + unsigned short attributes; /* per char flags (not predefined) */ } XCharStruct; /* Configure window value mask bits */ @@ -133,8 +133,8 @@ typedef struct { #define XSetSubwindowMode(d, gc, mode) wxNoop() #define XFreeColormap(d, cmap) wxNoop() #define XSetTransientForHint(d, w, p) wxNoop() -#define XUnionRegion(sr1,sr2,r) GrUnionRegion(r,sr1,sr2) -#define XIntersectRegion(sr1,sr2,r) GrIntersectRegion(r,sr1,sr2) +#define XUnionRegion(sr1,sr2,r) GrUnionRegion(r,sr1,sr2) +#define XIntersectRegion(sr1,sr2,r) GrIntersectRegion(r,sr1,sr2) #define XEqualRegion(r1, r2) GrEqualRegion(r1, r2) #define XEmptyRegion(r) GrEmptyRegion(r) #define XOffsetRegion(r, x, y) GrOffsetRegion(r, x, y) @@ -144,7 +144,7 @@ typedef struct { /* TODO: Cannot find equivalent for this. */ #define XIconifyWindow(d, w, s) 0 #define XCreateWindowWithColor(d,p,x,y,w,h,bw,depth,cl,vis,backColor,foreColor) \ - GrNewWindow(p,x,y,w,h,bw,backColor,foreColor) + GrNewWindow(p,x,y,w,h,bw,backColor,foreColor) #define XLookupString(event, buf, len, sym, status) (*sym = (event)->scancode) #define XBell(a, b) GrBell() #define DisplayWidthMM(d, s) 100 @@ -163,45 +163,45 @@ typedef struct { * Data structure used by color operations */ typedef struct { - unsigned long pixel; - unsigned short red, green, blue; - char flags; /* do_red, do_green, do_blue */ - char pad; + unsigned long pixel; + unsigned short red, green, blue; + char flags; /* do_red, do_green, do_blue */ + char pad; } XColor; typedef struct { - int type; - Display *display; /* Display the event was read from */ - XID resourceid; /* resource id */ - unsigned long serial; /* serial number of failed request */ - unsigned char error_code; /* error code of failed request */ - unsigned char request_code; /* Major op-code of failed request */ - unsigned char minor_code; /* Minor op-code of failed request */ + int type; + Display *display; /* Display the event was read from */ + XID resourceid; /* resource id */ + unsigned long serial; /* serial number of failed request */ + unsigned char error_code; /* error code of failed request */ + unsigned char request_code; /* Major op-code of failed request */ + unsigned char minor_code; /* Minor op-code of failed request */ } XErrorEvent; /* * Visual structure; contains information about colormapping possible. */ typedef struct { - void *ext_data; /* hook for extension to hang data */ - VisualID visualid; /* visual id of this visual */ + void *ext_data; /* hook for extension to hang data */ + VisualID visualid; /* visual id of this visual */ #if defined(__cplusplus) || defined(c_plusplus) - int c_class; /* C++ class of screen (monochrome, etc.) */ + int c_class; /* C++ class of screen (monochrome, etc.) */ #else - int class; /* class of screen (monochrome, etc.) */ + int class; /* class of screen (monochrome, etc.) */ #endif - unsigned long red_mask, green_mask, blue_mask; /* mask values */ - int bits_per_rgb; /* log base 2 of distinct color values */ - int map_entries; /* color map entries */ + unsigned long red_mask, green_mask, blue_mask; /* mask values */ + int bits_per_rgb; /* log base 2 of distinct color values */ + int map_entries; /* color map entries */ } Visual; /* * Depth structure; contains information for each possible depth. - */ + */ typedef struct { - int depth; /* this depth (Z) of the depth */ - int nvisuals; /* number of Visual types at this depth */ - Visual *visuals; /* list of visuals possible at this depth */ + int depth; /* this depth (Z) of the depth */ + int nvisuals; /* number of Visual types at this depth */ + Visual *visuals; /* list of visuals possible at this depth */ } Depth; /* @@ -210,56 +210,56 @@ typedef struct { * by application code. */ -struct _XDisplay; /* Forward declare before use for C++ */ +struct _XDisplay; /* Forward declare before use for C++ */ typedef struct { - void *ext_data; /* hook for extension to hang data */ - struct _XDisplay *display;/* back pointer to display structure */ - Window root; /* Root window id. */ - int width, height; /* width and height of screen */ - int mwidth, mheight; /* width and height of in millimeters */ - int ndepths; /* number of depths possible */ - Depth *depths; /* list of allowable depths on the screen */ - int root_depth; /* bits per pixel */ - Visual *root_visual; /* root visual */ - GC default_gc; /* GC for the root root visual */ - Colormap cmap; /* default color map */ - unsigned long white_pixel; - unsigned long black_pixel; /* White and Black pixel values */ - int max_maps, min_maps; /* max and min color maps */ - int backing_store; /* Never, WhenMapped, Always */ - Bool save_unders; - long root_input_mask; /* initial root input mask */ + void *ext_data; /* hook for extension to hang data */ + struct _XDisplay *display; /* back pointer to display structure */ + Window root; /* Root window id. */ + int width, height; /* width and height of screen */ + int mwidth, mheight; /* width and height of in millimeters */ + int ndepths; /* number of depths possible */ + Depth *depths; /* list of allowable depths on the screen */ + int root_depth; /* bits per pixel */ + Visual *root_visual; /* root visual */ + GC default_gc; /* GC for the root root visual */ + Colormap cmap; /* default color map */ + unsigned long white_pixel; + unsigned long black_pixel; /* White and Black pixel values */ + int max_maps, min_maps; /* max and min color maps */ + int backing_store; /* Never, WhenMapped, Always */ + Bool save_unders; + long root_input_mask; /* initial root input mask */ } Screen; typedef struct { - int x, y; /* location of window */ + int x, y; /* location of window */ int width, height; /* width and height of window */ - int border_width; /* border width of window */ - int depth; /* depth of window */ - Visual *visual; /* the associated visual structure */ - Window root; /* root of screen containing window */ - int _class; /* InputOutput, InputOnly*/ - int bit_gravity; /* one of the bit gravity values */ - int win_gravity; /* one of the window gravity values */ + int border_width; /* border width of window */ + int depth; /* depth of window */ + Visual *visual; /* the associated visual structure */ + Window root; /* root of screen containing window */ + int _class; /* InputOutput, InputOnly*/ + int bit_gravity; /* one of the bit gravity values */ + int win_gravity; /* one of the window gravity values */ int backing_store; /* NotUseful, WhenMapped, Always */ unsigned long backing_planes;/* planes to be preserved if possible */ unsigned long backing_pixel;/* value to be used when restoring planes */ - Bool save_under; /* boolean, should bits under be saved? */ + Bool save_under; /* boolean, should bits under be saved? */ Colormap colormap; /* color map to be associated with window */ Bool map_installed; /* boolean, is color map currently installed*/ - int map_state; /* IsUnmapped, IsUnviewable, IsViewable */ + int map_state; /* IsUnmapped, IsUnviewable, IsViewable */ long all_event_masks; /* set of events all people have interest in*/ long your_event_mask; /* my event mask */ long do_not_propagate_mask;/* set of events that should not propagate */ Bool override_redirect; /* boolean value for override-redirect */ - Screen *screen; /* back pointer to correct screen */ + Screen *screen; /* back pointer to correct screen */ } XWindowAttributes; -typedef int (*XErrorHandler) ( /* WARNING, this type not in Xlib spec */ - Display* /* display */, - XErrorEvent* /* error_event */ +typedef int (*XErrorHandler) (/* WARNING, this type not in Xlib spec */ + Display* /* display */, + XErrorEvent* /* error_event */ ); /* events*/ diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp index db9150bb15..41e821cb83 100644 --- a/samples/dataview/dataview.cpp +++ b/samples/dataview/dataview.cpp @@ -1281,7 +1281,7 @@ void MyFrame::OnDropPossible( wxDataViewEvent &event ) if (event.GetDataFormat() != wxDF_UNICODETEXT) event.Veto(); else - event.SetDropEffect(wxDragMove); // check 'move' drop effect + event.SetDropEffect(wxDragMove); // check 'move' drop effect } void MyFrame::OnDrop( wxDataViewEvent &event ) diff --git a/samples/regtest/regtest.rc b/samples/regtest/regtest.rc index e8d9832066..d8ad09c9bc 100644 --- a/samples/regtest/regtest.rc +++ b/samples/regtest/regtest.rc @@ -1,9 +1,9 @@ #include "../sample.rc" -app_icon ICON "registry.ico" -icon_key1 ICON "key1.ico" -icon_key2 ICON "key2.ico" -icon_key3 ICON "key3.ico" -icon_value1 ICON "value1.ico" -icon_value2 ICON "value2.ico" +app_icon ICON "registry.ico" +icon_key1 ICON "key1.ico" +icon_key2 ICON "key2.ico" +icon_key3 ICON "key3.ico" +icon_value1 ICON "value1.ico" +icon_value2 ICON "value2.ico" diff --git a/samples/sound/sound.rc b/samples/sound/sound.rc index 21a5d21ac7..ec4bbc5beb 100644 --- a/samples/sound/sound.rc +++ b/samples/sound/sound.rc @@ -1,3 +1,3 @@ -FromResource WAVE "cuckoo.wav" +FromResource WAVE "cuckoo.wav" #include "../sample.rc" diff --git a/samples/stc/edit.cpp b/samples/stc/edit.cpp index c198afaa7d..64b7b38f03 100644 --- a/samples/stc/edit.cpp +++ b/samples/stc/edit.cpp @@ -52,8 +52,8 @@ const int ANNOTATION_STYLE = wxSTC_STYLE_LASTPREDEFINED + 1; // A small image of a hashtag symbol used in the autocompletion window. const char* hashtag_xpm[] = { "10 10 2 1", -" c None", -". c #BD08F9", +" c None", +". c #BD08F9", " .. .. ", " .. .. ", "..........", diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp index fee40dfe68..b32ddf9a20 100644 --- a/src/gtk1/bitmap.cpp +++ b/src/gtk1/bitmap.cpp @@ -222,16 +222,16 @@ bool wxMask::Create( const wxBitmap& bitmap ) wxBitmap wxMask::GetBitmap() const { - wxBitmap bitmap; + wxBitmap bitmap; - if (m_bitmap) - { - bitmap.SetBitmap( m_bitmap ); - bitmap.SetWidth( m_width ); - bitmap.SetHeight( m_height ); - } + if (m_bitmap) + { + bitmap.SetBitmap( m_bitmap ); + bitmap.SetWidth( m_width ); + bitmap.SetHeight( m_height ); + } - return bitmap; + return bitmap; } diff --git a/src/msw/uxtheme.cpp b/src/msw/uxtheme.cpp index c11e74641a..020731e580 100644 --- a/src/msw/uxtheme.cpp +++ b/src/msw/uxtheme.cpp @@ -34,11 +34,11 @@ bool wxUxThemeIsActive() { - return ::IsAppThemed() && ::IsThemeActive(); + return ::IsAppThemed() && ::IsThemeActive(); } #else bool wxUxThemeIsActive() { - return false; + return false; } #endif // wxUSE_UXTHEME diff --git a/src/osx/carbon/colordlgosx.mm b/src/osx/carbon/colordlgosx.mm index e487a06119..dfd888ceda 100644 --- a/src/osx/carbon/colordlgosx.mm +++ b/src/osx/carbon/colordlgosx.mm @@ -138,7 +138,7 @@ int wxColourDialog::ShowModal() [theColorPanel setDelegate:theCPDelegate]; // - // Start the color panel modal loop + // Start the color panel modal loop // OSXBeginModalDialog(); NSModalSession session = [NSApp beginModalSessionForWindow:theColorPanel]; diff --git a/src/osx/cocoa/choice.mm b/src/osx/cocoa/choice.mm index c75ece4c84..c7ea9dbad7 100644 --- a/src/osx/cocoa/choice.mm +++ b/src/osx/cocoa/choice.mm @@ -116,16 +116,16 @@ public: } size_t GetNumberOfItems() const wxOVERRIDE - { + { return m_popUpMenu->GetMenuItemCount(); - } + } void RemoveItem( size_t pos ) wxOVERRIDE { m_popUpMenu->Delete( m_popUpMenu->FindItemByPosition( pos ) ); } - void SetItem(int pos, const wxString& s) wxOVERRIDE + void SetItem(int pos, const wxString& s) wxOVERRIDE { m_popUpMenu->FindItemByPosition( pos )->SetItemLabel( s ) ; } diff --git a/src/osx/cocoa/evtloop.mm b/src/osx/cocoa/evtloop.mm index dfe7e5f381..f0ca589d42 100644 --- a/src/osx/cocoa/evtloop.mm +++ b/src/osx/cocoa/evtloop.mm @@ -69,7 +69,7 @@ static NSUInteger CalculateNSEventMaskFromEventCategory(wxEventCategory cat) if ( cat | wxEVT_CATEGORY_USER_INPUT ) { mask |= - NSLeftMouseDownMask | + NSLeftMouseDownMask | NSLeftMouseUpMask | NSRightMouseDownMask | NSRightMouseUpMask | diff --git a/src/osx/cocoa/statbmp.mm b/src/osx/cocoa/statbmp.mm index afb5566e7d..bdd496da6d 100644 --- a/src/osx/cocoa/statbmp.mm +++ b/src/osx/cocoa/statbmp.mm @@ -65,7 +65,7 @@ public : { } - void SetLabel( const wxString& WXUNUSED(title), wxFontEncoding WXUNUSED(encoding) ) wxOVERRIDE + void SetLabel( const wxString& WXUNUSED(title), wxFontEncoding WXUNUSED(encoding) ) wxOVERRIDE { // although NSControl has this method, NSImageView throws an exception if it is called } diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm index 02b1782f14..ed2dfaff89 100644 --- a/src/osx/cocoa/utils.mm +++ b/src/osx/cocoa/utils.mm @@ -364,7 +364,7 @@ void wxBell() /* This is needed because otherwise we don't receive any key-up events for command-key - combinations (an AppKit bug, apparently) */ + combinations (an AppKit bug, apparently) */ - (void)sendEvent:(NSEvent *)anEvent { if ([anEvent type] == NSKeyUp && ([anEvent modifierFlags] & NSCommandKeyMask)) diff --git a/src/osx/iphone/evtloop.mm b/src/osx/iphone/evtloop.mm index 7e0c695570..263612a604 100644 --- a/src/osx/iphone/evtloop.mm +++ b/src/osx/iphone/evtloop.mm @@ -41,35 +41,33 @@ /* static int CalculateUIEventMaskFromEventCategory(wxEventCategory cat) { - NSLeftMouseDownMask | - NSLeftMouseUpMask | - NSRightMouseDownMask | - NSRightMouseUpMask = 1 << NSRightMouseUp, - NSMouseMovedMask = 1 << NSMouseMoved, - NSLeftMouseDraggedMask = 1 << NSLeftMouseDragged, - NSRightMouseDraggedMask = 1 << NSRightMouseDragged, - NSMouseEnteredMask = 1 << NSMouseEntered, - NSMouseExitedMask = 1 << NSMouseExited, - NSScrollWheelMask = 1 << NSScrollWheel, - NSTabletPointMask = 1 << NSTabletPoint, - NSTabletProximityMask = 1 << NSTabletProximity, - NSOtherMouseDownMask = 1 << NSOtherMouseDown, - NSOtherMouseUpMask = 1 << NSOtherMouseUp, - NSOtherMouseDraggedMask = 1 << NSOtherMouseDragged, + NSLeftMouseDownMask | + NSLeftMouseUpMask | + NSRightMouseDownMask | + NSRightMouseUpMask = 1 << NSRightMouseUp, + NSMouseMovedMask = 1 << NSMouseMoved, + NSLeftMouseDraggedMask = 1 << NSLeftMouseDragged, + NSRightMouseDraggedMask = 1 << NSRightMouseDragged, + NSMouseEnteredMask = 1 << NSMouseEntered, + NSMouseExitedMask = 1 << NSMouseExited, + NSScrollWheelMask = 1 << NSScrollWheel, + NSTabletPointMask = 1 << NSTabletPoint, + NSTabletProximityMask = 1 << NSTabletProximity, + NSOtherMouseDownMask = 1 << NSOtherMouseDown, + NSOtherMouseUpMask = 1 << NSOtherMouseUp, + NSOtherMouseDraggedMask = 1 << NSOtherMouseDragged, + NSKeyDownMask = 1 << NSKeyDown, + NSKeyUpMask = 1 << NSKeyUp, + NSFlagsChangedMask = 1 << NSFlagsChanged, + NSAppKitDefinedMask = 1 << NSAppKitDefined, + NSSystemDefinedMask = 1 << NSSystemDefined, + UIApplicationDefinedMask = 1 << UIApplicationDefined, + NSPeriodicMask = 1 << NSPeriodic, + NSCursorUpdateMask = 1 << NSCursorUpdate, - NSKeyDownMask = 1 << NSKeyDown, - NSKeyUpMask = 1 << NSKeyUp, - NSFlagsChangedMask = 1 << NSFlagsChanged, - - NSAppKitDefinedMask = 1 << NSAppKitDefined, - NSSystemDefinedMask = 1 << NSSystemDefined, - UIApplicationDefinedMask = 1 << UIApplicationDefined, - NSPeriodicMask = 1 << NSPeriodic, - NSCursorUpdateMask = 1 << NSCursorUpdate, - - NSAnyEventMask = 0xffffffffU + NSAnyEventMask = 0xffffffffU } */ diff --git a/src/osx/iphone/statbmp.mm b/src/osx/iphone/statbmp.mm index 0c89368e84..91d066c067 100644 --- a/src/osx/iphone/statbmp.mm +++ b/src/osx/iphone/statbmp.mm @@ -41,7 +41,7 @@ public : { } - void SetLabel( const wxString& title, wxFontEncoding encoding ) wxOVERRIDE + void SetLabel( const wxString& title, wxFontEncoding encoding ) wxOVERRIDE { // although NSControl has this method, NSImageView throws an exception if it is called } diff --git a/src/osx/iphone/utils.mm b/src/osx/iphone/utils.mm index 3863f68d97..cfde22b67a 100644 --- a/src/osx/iphone/utils.mm +++ b/src/osx/iphone/utils.mm @@ -58,7 +58,7 @@ return YES; } -- (void)applicationDidFinishLaunching:(UIApplication *)application { +- (void)applicationDidFinishLaunching:(UIApplication *)application { wxTheApp->OSXOnDidFinishLaunching(); } diff --git a/src/richtext/richtextdialogs.pjd b/src/richtext/richtextdialogs.pjd index 889583767a..b400b615ec 100644 --- a/src/richtext/richtextdialogs.pjd +++ b/src/richtext/richtextdialogs.pjd @@ -72,7 +72,7 @@ #endif " - " /// %BODY% + " /// %BODY% " " /*! diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 2f69ea36e2..5537bebb05 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -1505,7 +1505,7 @@ void ScintillaWX::ImeStartComposition() { const int styleHere = pdoc->StyleIndexAt(sel.MainCaret()); LOGFONTW lf = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, L"" }; int sizeZoomed = vs.styles[styleHere].size + vs.zoomLevel * SC_FONT_SIZE_MULTIPLIER; - if (sizeZoomed <= 2 * SC_FONT_SIZE_MULTIPLIER) // Hangs if sizeZoomed <= 1 + if (sizeZoomed <= 2 * SC_FONT_SIZE_MULTIPLIER) // Hangs if sizeZoomed <= 1 sizeZoomed = 2 * SC_FONT_SIZE_MULTIPLIER; // The negative is to allow for leading lf.lfHeight = -::MulDiv(sizeZoomed, stc->GetDPI().y, 72 * SC_FONT_SIZE_MULTIPLIER); diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp index f1604a4310..01eeb97c45 100644 --- a/src/univ/themes/gtk.cpp +++ b/src/univ/themes/gtk.cpp @@ -1004,8 +1004,8 @@ void wxGTKRenderer::DrawRadioButtonBitmap(wxDC& dc, dc.SetPen(m_penDarkGrey); dc.SetBrush(wxSCHEME_COLOUR(m_scheme, CONTROL_CURRENT)); - // draw the normal border - dc.DrawCircle(xRight/2,yBottom/2,yMid); + // draw the normal border + dc.DrawCircle(xRight/2,yBottom/2,yMid); wxColor checkedCol, uncheckedCol; checkedCol = wxSCHEME_COLOUR(m_scheme, SHADOW_DARK); diff --git a/src/unix/glegl.cpp b/src/unix/glegl.cpp index c6de82f828..eac7c5400f 100644 --- a/src/unix/glegl.cpp +++ b/src/unix/glegl.cpp @@ -479,7 +479,7 @@ bool wxGLCanvasEGL::CreateSurface() wl_registry_add_listener(registry, &wl_registry_listener, this); wl_display_roundtrip(display); if ( !m_wlCompositor || !m_wlSubcompositor ) - { + { wxFAIL_MSG("Invalid Wayland compositor or subcompositor"); return false; } diff --git a/src/x11/nanox.c b/src/x11/nanox.c index a9619fb547..2edb62167f 100644 --- a/src/x11/nanox.c +++ b/src/x11/nanox.c @@ -84,8 +84,8 @@ int XCopyArea(Display* display, Drawable src, Drawable dest, GC gc, int dest_x, int dest_y) { GrCopyArea(dest, gc, dest_x, dest_y, - width, height, src, - src_x, src_y, 0); + width, height, src, + src_x, src_y, 0); return Success; } @@ -94,55 +94,55 @@ int XCopyPlane(Display* display, Drawable src, Drawable dest, GC gc, int dest_x, int dest_y, unsigned long plane) { GrCopyArea(dest, gc, dest_x, dest_y, - width, height, src, - src_x, src_y, 0); + width, height, src, + src_x, src_y, 0); return Success; } #if 0 typedef struct { - GR_WINDOW_ID wid; /* window id (or 0 if no such window) */ - GR_WINDOW_ID parent; /* parent window id */ - GR_WINDOW_ID child; /* first child window id (or 0) */ - GR_WINDOW_ID sibling; /* next sibling window id (or 0) */ - GR_BOOL inputonly; /* TRUE if window is input only */ - GR_BOOL mapped; /* TRUE if window is mapped */ - GR_COUNT unmapcount; /* reasons why window is unmapped */ - GR_COORD x; /* absolute x position of window */ - GR_COORD y; /* absolute y position of window */ - GR_SIZE width; /* width of window */ - GR_SIZE height; /* height of window */ - GR_SIZE bordersize; /* size of border */ - GR_COLOR bordercolor; /* color of border */ - GR_COLOR background; /* background color */ - GR_EVENT_MASK eventmask; /* current event mask for this client */ - GR_WM_PROPS props; /* window properties */ - GR_CURSOR_ID cursor; /* cursor id*/ - unsigned long processid; /* process id of owner*/ + GR_WINDOW_ID wid; /* window id (or 0 if no such window) */ + GR_WINDOW_ID parent; /* parent window id */ + GR_WINDOW_ID child; /* first child window id (or 0) */ + GR_WINDOW_ID sibling; /* next sibling window id (or 0) */ + GR_BOOL inputonly; /* TRUE if window is input only */ + GR_BOOL mapped; /* TRUE if window is mapped */ + GR_COUNT unmapcount; /* reasons why window is unmapped */ + GR_COORD x; /* absolute x position of window */ + GR_COORD y; /* absolute y position of window */ + GR_SIZE width; /* width of window */ + GR_SIZE height; /* height of window */ + GR_SIZE bordersize; /* size of border */ + GR_COLOR bordercolor; /* color of border */ + GR_COLOR background; /* background color */ + GR_EVENT_MASK eventmask; /* current event mask for this client */ + GR_WM_PROPS props; /* window properties */ + GR_CURSOR_ID cursor; /* cursor id*/ + unsigned long processid; /* process id of owner*/ } GR_WINDOW_INFO; typedef struct { - int x, y; /* location of window */ + int x, y; /* location of window */ int width, height; /* width and height of window */ - int border_width; /* border width of window */ - int depth; /* depth of window */ - Visual *visual; /* the associated visual structure */ - Window root; /* root of screen containing window */ - int class; /* InputOutput, InputOnly*/ - int bit_gravity; /* one of the bit gravity values */ - int win_gravity; /* one of the window gravity values */ + int border_width; /* border width of window */ + int depth; /* depth of window */ + Visual *visual; /* the associated visual structure */ + Window root; /* root of screen containing window */ + int class; /* InputOutput, InputOnly*/ + int bit_gravity; /* one of the bit gravity values */ + int win_gravity; /* one of the window gravity values */ int backing_store; /* NotUseful, WhenMapped, Always */ unsigned long backing_planes;/* planes to be preserved if possible */ unsigned long backing_pixel;/* value to be used when restoring planes */ - Bool save_under; /* boolean, should bits under be saved? */ + Bool save_under; /* boolean, should bits under be saved? */ Colormap colormap; /* color map to be associated with window */ Bool map_installed; /* boolean, is color map currently installed*/ - int map_state; /* IsUnmapped, IsUnviewable, IsViewable */ + int map_state; /* IsUnmapped, IsUnviewable, IsViewable */ long all_event_masks; /* set of events all people have interest in*/ long your_event_mask; /* my event mask */ long do_not_propagate_mask;/* set of events that should not propagate */ Bool override_redirect; /* boolean value for override-redirect */ - Screen *screen; /* back pointer to correct screen */ + Screen *screen; /* back pointer to correct screen */ } XWindowAttributes; #endif @@ -222,7 +222,7 @@ XErrorHandler XSetErrorHandler (XErrorHandler handler) } static Screen s_screen; -Screen *XScreenOfDisplay(Display* display, +Screen *XScreenOfDisplay(Display* display, int screen_number) { /* TODO: fill in the members. See Xlib.h */ diff --git a/tests/controls/textctrltest.cpp b/tests/controls/textctrltest.cpp index cdfe5b6ef9..3990fc675b 100644 --- a/tests/controls/textctrltest.cpp +++ b/tests/controls/textctrltest.cpp @@ -342,7 +342,7 @@ void TextCtrlTestCase::Redirector() void TextCtrlTestCase::HitTestSingleLine() { #ifdef __WXQT__ - WARN("Does not work under WxQt"); + WARN("Does not work under WxQt"); #else m_text->ChangeValue("Hit me"); @@ -513,7 +513,7 @@ void TextCtrlTestCase::Style() CHECK( style.GetTextColour() == *wxRED ); CHECK( style.GetBackgroundColour() == *wxWHITE ); #else - WARN("Does not work under WxQt or OSX"); + WARN("Does not work under WxQt or OSX"); #endif }