X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/61ecf6d34ffb087e4a02d1c4e29e1f155875eba0..c0b0635cf69537ca32377bad5650b39402cb21b6:/src/univ/themes/win32.cpp diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp index d3afd47d7c..e36989fa53 100644 --- a/src/univ/themes/win32.cpp +++ b/src/univ/themes/win32.cpp @@ -5,7 +5,7 @@ // Created: 06.08.00 // RCS-ID: $Id$ // Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // =========================================================================== @@ -38,7 +38,9 @@ #include "wx/scrolbar.h" #include "wx/slider.h" #include "wx/textctrl.h" + #include "wx/listbox.h" #include "wx/toolbar.h" + #include "wx/statusbr.h" #ifdef __WXMSW__ // for COLOR_* constants @@ -80,6 +82,10 @@ static const size_t WIDTH_STATUSBAR_GRIP_BAND = 4; static const size_t STATUSBAR_GRIP_SIZE = WIDTH_STATUSBAR_GRIP_BAND*NUM_STATUSBAR_GRIP_BANDS; +static const wxCoord SLIDER_MARGIN = 6; // margin around slider +static const wxCoord SLIDER_THUMB_LENGTH = 18; +static const wxCoord SLIDER_TICK_LENGTH = 6; + enum IndicatorType { IndicatorType_Check, @@ -235,7 +241,8 @@ public: const wxString& label, const wxBitmap& bitmap, const wxRect& rect, - int flags); + int flags = 0, + long style = 0); virtual void DrawTextLine(wxDC& dc, const wxString& text, const wxRect& rect, @@ -253,21 +260,25 @@ public: virtual void DrawSliderShaft(wxDC& dc, const wxRect& rect, + int lenThumb, wxOrientation orient, int flags = 0, + long style = 0, wxRect *rectShaft = NULL); virtual void DrawSliderThumb(wxDC& dc, const wxRect& rect, wxOrientation orient, - int flags = 0); + int flags = 0, + long style = 0); virtual void DrawSliderTicks(wxDC& dc, const wxRect& rect, - const wxSize& sizeThumb, + int lenThumb, wxOrientation orient, int start, int end, int step = 1, - int flags = 0); + int flags = 0, + long style = 0); virtual void DrawMenuBarItem(wxDC& dc, const wxRect& rect, @@ -289,7 +300,7 @@ public: virtual void DrawStatusField(wxDC& dc, const wxRect& rect, const wxString& label, - int flags = 0); + int flags = 0, int style = 0); // titlebars virtual void DrawFrameTitleBar(wxDC& dc, @@ -366,11 +377,14 @@ public: virtual wxSize GetTabIndent() const { return wxSize(2, 2); } virtual wxSize GetTabPadding() const { return wxSize(6, 5); } - virtual wxCoord GetSliderDim() const { return 20; } - virtual wxCoord GetSliderTickLen() const { return 4; } + virtual wxCoord GetSliderDim() const { return SLIDER_THUMB_LENGTH + 2*BORDER_THICKNESS; } + virtual wxCoord GetSliderTickLen() const { return SLIDER_TICK_LENGTH; } virtual wxRect GetSliderShaftRect(const wxRect& rect, - wxOrientation orient) const; + int lenThumb, + wxOrientation orient, + long style = 0) const; virtual wxSize GetSliderThumbSize(const wxRect& rect, + int lenThumb, wxOrientation orient) const; virtual wxSize GetProgressBarStep() const { return wxSize(16, 32); } @@ -429,7 +443,7 @@ protected: void DrawSunkenBorder(wxDC& dc, wxRect *rect); // draw the border used for scrollbar arrows - void DrawArrowBorder(wxDC& dc, wxRect *rect, bool isPressed = FALSE); + void DrawArrowBorder(wxDC& dc, wxRect *rect, bool isPressed = false); // public DrawArrow()s helper void DrawArrow(wxDC& dc, const wxRect& rect, @@ -455,7 +469,7 @@ protected: void DrawLine(wxDC& dc, wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, - bool transpose = FALSE) + bool transpose = false) { if ( transpose ) dc.DrawLine(y1, x1, y2, x2); @@ -537,7 +551,8 @@ public: protected: virtual bool IsAllowedButton(int button) { return button == 1; } - virtual void Highlight(wxScrollBar *scrollbar, bool doIt) + virtual void Highlight(wxScrollBar * WXUNUSED(scrollbar), + bool WXUNUSED(doIt)) { // we don't highlight anything } @@ -645,7 +660,7 @@ protected: // wxWin32Theme // ---------------------------------------------------------------------------- -WX_DEFINE_ARRAY(wxInputHandler *, wxArrayHandlers); +WX_DEFINE_ARRAY_PTR(wxInputHandler *, wxArrayHandlers); class wxWin32Theme : public wxTheme { @@ -1317,21 +1332,32 @@ wxColour wxWin32ColourScheme::GetBackground(wxWindow *win) const col = win->GetBackgroundColour(); } - if ( win->IsContainerWindow() ) + if ( !win->ShouldInheritColours() ) { wxTextCtrl *text = wxDynamicCast(win, wxTextCtrl); - if ( text ) +#if wxUSE_LISTBOX + wxListBox* listBox = wxDynamicCast(win, wxListBox); +#endif + if ( text +#if wxUSE_LISTBOX + || listBox +#endif + ) { - if ( !text->IsEnabled() ) // not IsEditable() + if ( !win->IsEnabled() ) // not IsEditable() col = Get(CONTROL); - //else: execute code below - } - - if ( !col.Ok() ) - { - // doesn't depend on the state - col = Get(WINDOW); + else + { + if ( !col.Ok() ) + { + // doesn't depend on the state + col = Get(WINDOW); + } + } } + + if (!col.Ok()) + col = Get(CONTROL); // Most controls should be this colour, not WINDOW } else { @@ -1737,8 +1763,7 @@ void wxWin32Renderer::DrawHalfRect(wxDC& dc, wxRect *rect, const wxPen& pen) rect->GetRight(), rect->GetBottom()); // adjust the rect - rect->width--; - rect->height--; + rect->Inflate(-1); } void wxWin32Renderer::DrawShadedRect(wxDC& dc, wxRect *rect, @@ -1892,7 +1917,7 @@ wxRect wxWin32Renderer::GetBorderDimensions(wxBorder border) const bool wxWin32Renderer::AreScrollbarsInsideBorder() const { - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -2259,7 +2284,7 @@ void wxWin32Renderer::DrawCheckItem(wxDC& dc, } dc.DrawBitmap(bmp, rect.x, rect.y + (rect.height - bmp.GetHeight()) / 2 - 1, - TRUE /* use mask */); + true /* use mask */); wxRect rectLabel = rect; int bmpWidth = bmp.GetWidth(); @@ -2340,7 +2365,7 @@ void wxWin32Renderer::DrawCheckOrRadioButton(wxDC& dc, rectLabel.SetRight(rect.GetRight()); } - dc.DrawBitmap(bitmap, xBmp, yBmp, TRUE /* use mask */); + dc.DrawBitmap(bitmap, xBmp, yBmp, true /* use mask */); DoDrawLabel( dc, label, rectLabel, @@ -2397,9 +2422,10 @@ void wxWin32Renderer::DrawToolBarButton(wxDC& dc, const wxString& label, const wxBitmap& bitmap, const wxRect& rectOrig, - int flags) + int flags, + long style) { - if ( !label.empty() || bitmap.Ok() ) + if (style == wxTOOL_STYLE_BUTTON) { wxRect rect = rectOrig; rect.Deflate(BORDER_THICKNESS); @@ -2415,7 +2441,7 @@ void wxWin32Renderer::DrawToolBarButton(wxDC& dc, dc.DrawLabel(label, bitmap, rect, wxALIGN_CENTRE); } - else // a separator + else if (style == wxTOOL_STYLE_SEPARATOR) { // leave a small gap aroudn the line, also account for the toolbar // border itself @@ -2423,6 +2449,7 @@ void wxWin32Renderer::DrawToolBarButton(wxDC& dc, rectOrig.y + 2*BORDER_THICKNESS, rectOrig.GetBottom() - BORDER_THICKNESS); } + // don't draw wxTOOL_STYLE_CONTROL } // ---------------------------------------------------------------------------- @@ -2440,7 +2467,9 @@ void wxWin32Renderer::DrawTextLine(wxDC& dc, StandardDrawTextLine(dc, text, rect, selStart, selEnd, flags); } -void wxWin32Renderer::DrawLineWrapMark(wxDC& dc, const wxRect& rect) +void +wxWin32Renderer::DrawLineWrapMark(wxDC& WXUNUSED(dc), + const wxRect& WXUNUSED(rect)) { // we don't draw them } @@ -2571,53 +2600,82 @@ void wxWin32Renderer::DrawTab(wxDC& dc, // slider // ---------------------------------------------------------------------------- -wxSize wxWin32Renderer::GetSliderThumbSize(const wxRect& rect, - wxOrientation orient) const +wxSize +wxWin32Renderer::GetSliderThumbSize(const wxRect& WXUNUSED(rect), + int lenThumb, + wxOrientation orient) const { wxSize size; + wxCoord width = wxMax (lenThumb, SLIDER_THUMB_LENGTH) / 2; + wxCoord height = wxMax (lenThumb, SLIDER_THUMB_LENGTH); - wxRect rectShaft = GetSliderShaftRect(rect, orient); - if ( orient == wxHORIZONTAL ) + if (orient == wxHORIZONTAL) { - size.y = rect.height - 6; - size.x = wxMin(size.y / 2, rectShaft.width); + size.x = width; + size.y = height; } - else // vertical - { - size.x = rect.width - 6; - size.y = wxMin(size.x / 2, rectShaft.height); + else + { // == wxVERTICAL + size.x = height; + size.y = width; } return size; } wxRect wxWin32Renderer::GetSliderShaftRect(const wxRect& rectOrig, - wxOrientation orient) const + int lenThumb, + wxOrientation orient, + long style) const { - static const wxCoord SLIDER_MARGIN = 6; + bool transpose = (orient == wxVERTICAL); + bool left = ((style & wxSL_AUTOTICKS) != 0) & + (((style & wxSL_TOP) != 0) & !transpose | + ((style & wxSL_LEFT) != 0) & transpose | + ((style & wxSL_BOTH) != 0)); + bool right = ((style & wxSL_AUTOTICKS) != 0) & + (((style & wxSL_BOTTOM) != 0) & !transpose | + ((style & wxSL_RIGHT) != 0) & transpose | + ((style & wxSL_BOTH) != 0)); wxRect rect = rectOrig; - if ( orient == wxHORIZONTAL ) - { - // make the rect of minimal width and centre it - rect.height = 2*BORDER_THICKNESS; - rect.y = rectOrig.y + (rectOrig.height - rect.height) / 2; - if ( rect.y < 0 ) - rect.y = 0; + wxSize sizeThumb = GetSliderThumbSize (rect, lenThumb, orient); - // leave margins on the sides - rect.Deflate(SLIDER_MARGIN, 0); + if (orient == wxHORIZONTAL) { + rect.x += SLIDER_MARGIN; + if (left & right) + { + rect.y += wxMax ((rect.height - 2*BORDER_THICKNESS) / 2, sizeThumb.y/2); + } + else if (left) + { + rect.y += wxMax ((rect.height - 2*BORDER_THICKNESS - sizeThumb.y/2), sizeThumb.y/2); + } + else + { + rect.y += sizeThumb.y/2; + } + rect.width -= 2*SLIDER_MARGIN; + rect.height = 2*BORDER_THICKNESS; } - else // vertical - { - // same as above but in other direction + else + { // == wxVERTICAL + rect.y += SLIDER_MARGIN; + if (left & right) + { + rect.x += wxMax ((rect.width - 2*BORDER_THICKNESS) / 2, sizeThumb.x/2); + } + else if (left) + { + rect.x += wxMax ((rect.width - 2*BORDER_THICKNESS - sizeThumb.x/2), sizeThumb.x/2); + } + else + { + rect.x += sizeThumb.x/2; + } rect.width = 2*BORDER_THICKNESS; - rect.x = rectOrig.x + (rectOrig.width - rect.width) / 2; - if ( rect.x < 0 ) - rect.x = 0; - - rect.Deflate(0, SLIDER_MARGIN); + rect.height -= 2*SLIDER_MARGIN; } return rect; @@ -2625,19 +2683,37 @@ wxRect wxWin32Renderer::GetSliderShaftRect(const wxRect& rectOrig, void wxWin32Renderer::DrawSliderShaft(wxDC& dc, const wxRect& rectOrig, + int lenThumb, wxOrientation orient, int flags, + long style, wxRect *rectShaft) { - if ( flags & wxCONTROL_FOCUSED ) - { + /* show shaft geometry + + shaft + +-------------+ + | | + | XXX | <-- x1 + | XXX | + | XXX | + | XXX | + | XXX | <-- x2 + | | + +-------------+ + + ^ ^ + | | + y1 y2 + */ + + if (flags & wxCONTROL_FOCUSED) { DrawFocusRect(dc, rectOrig); } - wxRect rect = GetSliderShaftRect(rectOrig, orient); + wxRect rect = GetSliderShaftRect(rectOrig, lenThumb, orient, style); - if ( rectShaft ) - *rectShaft = rect; + if (rectShaft) *rectShaft = rect; DrawSunkenBorder(dc, &rect); } @@ -2645,26 +2721,31 @@ void wxWin32Renderer::DrawSliderShaft(wxDC& dc, void wxWin32Renderer::DrawSliderThumb(wxDC& dc, const wxRect& rect, wxOrientation orient, - int flags) + int flags, + long style) { - /* - we are drawing a shape of this form - - HHHHHHB <--- y - H DB - H DB - H DB where H is hightlight colour - H DB D dark grey - H DB B black - H DB - H DB <--- y3 - H DB - HDB - B <--- y2 - - ^ ^ ^ - | | | - x x3 x2 + /* show thumb geometry + + H <--- y1 + H H B + H H B + H H B <--- y3 + H D B + H D B + H D B + H D B where H is hightlight colour + H D B D dark grey + H D B B black + H D B + H D B + H D B <--- y4 + H D B + H D B + B <--- y2 + + ^ ^ ^ + | | | + x1 x3 x2 The interior of this shape is filled with the hatched brush if the thumb is pressed. @@ -2672,51 +2753,81 @@ void wxWin32Renderer::DrawSliderThumb(wxDC& dc, DrawBackground(dc, wxNullColour, rect, flags); - bool transpose = orient == wxVERTICAL; + bool transpose = (orient == wxVERTICAL); + bool left = ((style & wxSL_AUTOTICKS) != 0) & + (((style & wxSL_TOP) != 0) & !transpose | + ((style & wxSL_LEFT) != 0) & transpose) & + ((style & wxSL_BOTH) == 0); + bool right = ((style & wxSL_AUTOTICKS) != 0) & + (((style & wxSL_BOTTOM) != 0) & !transpose | + ((style & wxSL_RIGHT) != 0) & transpose) & + ((style & wxSL_BOTH) == 0); + + wxCoord sizeArrow = (transpose ? rect.height : rect.width) / 2; + wxCoord c = ((transpose ? rect.height : rect.width) - 2*sizeArrow); + + wxCoord x1, x2, x3, y1, y2, y3, y4; + x1 = (transpose ? rect.y : rect.x); + x2 = (transpose ? rect.GetBottom() : rect.GetRight()); + x3 = (x1-1+c) + sizeArrow; + y1 = (transpose ? rect.x : rect.y); + y2 = (transpose ? rect.GetRight() : rect.GetBottom()); + y3 = (left ? (y1-1+c) + sizeArrow : y1); + y4 = (right ? (y2+1-c) - sizeArrow : y2); - wxCoord x, y, x2, y2; - if ( transpose ) + dc.SetPen(m_penBlack); + if (left) { + DrawLine(dc, x3+1-c, y1, x2, y3, transpose); + } + DrawLine(dc, x2, y3, x2, y4, transpose); + if (right) { - x = rect.y; - y = rect.x; - x2 = rect.GetBottom(); - y2 = rect.GetRight(); + DrawLine(dc, x3+1-c, y2, x2, y4, transpose); } else { - x = rect.x; - y = rect.y; - x2 = rect.GetRight(); - y2 = rect.GetBottom(); + DrawLine(dc, x1, y2, x2, y2, transpose); } - // the size of the pointed part of the thumb - wxCoord sizeArrow = (transpose ? rect.height : rect.width) / 2; - - wxCoord x3 = x + sizeArrow, - y3 = y2 - sizeArrow; - - dc.SetPen(m_penHighlight); - DrawLine(dc, x, y, x2, y, transpose); - DrawLine(dc, x, y + 1, x, y2 - sizeArrow, transpose); - DrawLine(dc, x, y3, x3, y2, transpose); - - dc.SetPen(m_penBlack); - DrawLine(dc, x3, y2, x2, y3, transpose); - DrawLine(dc, x2, y3, x2, y - 1, transpose); - dc.SetPen(m_penDarkGrey); - DrawLine(dc, x3, y2 - 1, x2 - 1, y3, transpose); - DrawLine(dc, x2 - 1, y3, x2 - 1, y, transpose); + DrawLine(dc, x2-1, y3+1, x2-1, y4-1, transpose); + if (right) { + DrawLine(dc, x3+1-c, y2-1, x2-1, y4, transpose); + } + else + { + DrawLine(dc, x1+1, y2-1, x2-1, y2-1, transpose); + } - if ( flags & wxCONTROL_PRESSED ) + dc.SetPen(m_penHighlight); + if (left) + { + DrawLine(dc, x1, y3, x3, y1, transpose); + DrawLine(dc, x3+1-c, y1+1, x2-1, y3, transpose); + } + else + { + DrawLine(dc, x1, y1, x2, y1, transpose); + } + DrawLine(dc, x1, y3, x1, y4, transpose); + if (right) { + DrawLine(dc, x1, y4, x3+c, y2+c, transpose); + } + + if (flags & wxCONTROL_PRESSED) { // TODO: MSW fills the entire area inside, not just the rect wxRect rectInt = rect; - if ( transpose ) - rectInt.SetRight(y3); + if ( transpose ) + { + rectInt.SetLeft(y3); + rectInt.SetRight(y4); + } else - rectInt.SetBottom(y3); + { + rectInt.SetTop(y3); + rectInt.SetBottom(y4); + } rectInt.Deflate(2); #if !defined(__WXMGL__) @@ -2758,73 +2869,80 @@ void wxWin32Renderer::DrawSliderThumb(wxDC& dc, void wxWin32Renderer::DrawSliderTicks(wxDC& dc, const wxRect& rect, - const wxSize& sizeThumb, + int lenThumb, wxOrientation orient, int start, int end, int step, - int flags) + int WXUNUSED(flags), + long style) { - if ( end == start ) - { - // empty slider? - return; - } - - // this would lead to an infinite loop below - wxCHECK_RET( step > 1, _T("invalid step in wxRenderer::DrawSliderTicks") ); - - // the variable names correspond to horizontal case, but they can be used - // for both orientations - wxCoord x1, x2, y1, y2, len, widthThumb; - if ( orient == wxHORIZONTAL ) - { - x1 = rect.GetLeft(); - x2 = rect.GetRight(); - - // draw from bottom to top to leave one pixel space between the ticks - // and the slider as Windows do - y1 = rect.GetBottom(); - y2 = rect.GetTop(); - - len = rect.width; - - widthThumb = sizeThumb.x; - } - else // vertical - { - x1 = rect.GetTop(); - x2 = rect.GetBottom(); - - y1 = rect.GetRight(); - y2 = rect.GetLeft(); - - len = rect.height; - - widthThumb = sizeThumb.y; - } - - // the first tick should be positioned in such way that a thumb drawn in - // the first position points down directly to it - x1 += widthThumb / 2; - x2 -= widthThumb / 2; + /* show ticks geometry + + left right + ticks shaft ticks + ---- XX ---- <-- x1 + ---- XX ---- + ---- XX ---- + ---- XX ---- <-- x2 + + ^ ^ ^ ^ + | | | | + y3 y1 y2 y4 + */ - // this also means that we have slightly less space for the ticks in - // between the first and the last - len -= widthThumb; + // empty slider? + if (end == start) return; + + bool transpose = (orient == wxVERTICAL); + bool left = ((style & wxSL_AUTOTICKS) != 0) & + (((style & wxSL_TOP) != 0) & !transpose | + ((style & wxSL_LEFT) != 0) & transpose | + ((style & wxSL_BOTH) != 0)); + bool right = ((style & wxSL_AUTOTICKS) != 0) & + (((style & wxSL_BOTTOM) != 0) & !transpose | + ((style & wxSL_RIGHT) != 0) & transpose | + ((style & wxSL_BOTH) != 0)); + + // default thumb size + wxSize sizeThumb = GetSliderThumbSize (rect, 0, orient); + wxCoord defaultLen = (transpose ? sizeThumb.x : sizeThumb.y); + + // normal thumb size + sizeThumb = GetSliderThumbSize (rect, lenThumb, orient); + wxCoord widthThumb = (transpose ? sizeThumb.y : sizeThumb.x); + + wxRect rectShaft = GetSliderShaftRect (rect, lenThumb, orient, style); + + wxCoord x1, x2, y1, y2, y3, y4 , len; + x1 = (transpose ? rectShaft.y : rectShaft.x) + widthThumb/2; + x2 = (transpose ? rectShaft.GetBottom() : rectShaft.GetRight()) - widthThumb/2; + y1 = (transpose ? rectShaft.x : rectShaft.y) - defaultLen/2; + y2 = (transpose ? rectShaft.GetRight() : rectShaft.GetBottom()) + defaultLen/2; + y3 = (transpose ? rect.x : rect.y); + y4 = (transpose ? rect.GetRight() : rect.GetBottom()); + len = x2 - x1; dc.SetPen(m_penBlack); int range = end - start; - for ( int n = 0; n < range; n += step ) - { + for ( int n = 0; n < range; n += step ) { wxCoord x = x1 + (len*n) / range; - DrawLine(dc, x, y1, x, y2, orient == wxVERTICAL); + if (left & (y1 > y3)) { + DrawLine(dc, x, y1, x, y3, orient == wxVERTICAL); + } + if (right & (y4 > y2)) { + DrawLine(dc, x, y2, x, y4, orient == wxVERTICAL); + } } - // always draw the line at the end position - DrawLine(dc, x2, y1, x2, y2, orient == wxVERTICAL); + if (left & (y1 > y3)) { + DrawLine(dc, x2, y1, x2, y3, orient == wxVERTICAL); + } + if (right & (y4 > y2)) { + DrawLine(dc, x2, y2, x2, y4, orient == wxVERTICAL); + } } // ---------------------------------------------------------------------------- @@ -3021,7 +3139,7 @@ wxMenuGeometryInfo *wxWin32Renderer::GetMenuGeometry(wxWindow *win, widthAccelMax = 0, widthBmpMax = MENU_LEFT_MARGIN; - for ( wxMenuItemList::Node *node = menu.GetMenuItems().GetFirst(); + for ( wxMenuItemList::compatibility_iterator node = menu.GetMenuItems().GetFirst(); node; node = node->GetNext() ) { @@ -3107,7 +3225,7 @@ wxSize wxWin32Renderer::GetStatusBarBorders(wxCoord *borderBetweenFields) const void wxWin32Renderer::DrawStatusField(wxDC& dc, const wxRect& rect, const wxString& label, - int flags) + int flags, int style /*=0*/) { wxRect rectIn; @@ -3123,9 +3241,15 @@ void wxWin32Renderer::DrawStatusField(wxDC& dc, y2 = rect.GetBottom(); // draw the upper left part of the rect normally - dc.SetPen(m_penDarkGrey); - dc.DrawLine(rect.GetLeft(), rect.GetTop(), rect.GetLeft(), y2); - dc.DrawLine(rect.GetLeft() + 1, rect.GetTop(), x2, rect.GetTop()); + if (style != wxSB_FLAT) + { + if (style == wxSB_RAISED) + dc.SetPen(m_penHighlight); + else + dc.SetPen(m_penDarkGrey); + dc.DrawLine(rect.GetLeft(), rect.GetTop(), rect.GetLeft(), y2); + dc.DrawLine(rect.GetLeft() + 1, rect.GetTop(), x2, rect.GetTop()); + } // draw the grey stripes of the grip size_t n; @@ -3145,9 +3269,16 @@ void wxWin32Renderer::DrawStatusField(wxDC& dc, } // draw the remaining rect boundaries - ofs -= WIDTH_STATUSBAR_GRIP_BAND; - dc.DrawLine(x2, rect.GetTop(), x2, y2 - ofs + 1); - dc.DrawLine(rect.GetLeft(), y2, x2 - ofs + 1, y2); + if (style != wxSB_FLAT) + { + if (style == wxSB_RAISED) + dc.SetPen(m_penDarkGrey); + else + dc.SetPen(m_penHighlight); + ofs -= WIDTH_STATUSBAR_GRIP_BAND; + dc.DrawLine(x2, rect.GetTop(), x2, y2 - ofs + 1); + dc.DrawLine(rect.GetLeft(), y2, x2 - ofs + 1, y2); + } rectIn = rect; rectIn.Deflate(1); @@ -3156,7 +3287,10 @@ void wxWin32Renderer::DrawStatusField(wxDC& dc, } else // normal pane { - DrawBorder(dc, wxBORDER_STATIC, rect, flags, &rectIn); + if (style == wxSB_RAISED) + DrawBorder(dc, wxBORDER_RAISED, rect, flags, &rectIn); + else if (style != wxSB_FLAT) + DrawBorder(dc, wxBORDER_STATIC, rect, flags, &rectIn); } rectIn.Deflate(STATBAR_BORDER_X, STATBAR_BORDER_Y); @@ -3170,7 +3304,7 @@ void wxWin32Renderer::DrawStatusField(wxDC& dc, // ---------------------------------------------------------------------------- void wxWin32Renderer::GetComboBitmaps(wxBitmap *bmpNormal, - wxBitmap *bmpFocus, + wxBitmap * WXUNUSED(bmpFocus), wxBitmap *bmpPressed, wxBitmap *bmpDisabled) { @@ -3211,7 +3345,7 @@ void wxWin32Renderer::GetComboBitmaps(wxBitmap *bmpNormal, void wxWin32Renderer::DoDrawBackground(wxDC& dc, const wxColour& col, const wxRect& rect, - wxWindow *window ) + wxWindow * WXUNUSED(window)) { wxBrush brush(col, wxSOLID); dc.SetBrush(brush); @@ -3222,8 +3356,8 @@ void wxWin32Renderer::DoDrawBackground(wxDC& dc, void wxWin32Renderer::DrawBackground(wxDC& dc, const wxColour& col, const wxRect& rect, - int flags, - wxWindow *window ) + int WXUNUSED(flags), + wxWindow *window) { // just fill it with the given or default bg colour wxColour colBg = col.Ok() ? col : wxSCHEME_COLOUR(m_scheme, CONTROL); @@ -3284,7 +3418,7 @@ void wxWin32Renderer::DrawArrow(wxDC& dc, x--; // draw it - dc.DrawBitmap(bmp, x, y, TRUE /* use mask */); + dc.DrawBitmap(bmp, x, y, true /* use mask */); } void wxWin32Renderer::DrawArrowButton(wxDC& dc, @@ -3299,9 +3433,9 @@ void wxWin32Renderer::DrawArrowButton(wxDC& dc, } void wxWin32Renderer::DrawScrollbarThumb(wxDC& dc, - wxOrientation orient, + wxOrientation WXUNUSED(orient), const wxRect& rect, - int flags) + int WXUNUSED(flags)) { // we don't use the flags, the thumb never changes appearance wxRect rectThumb = rect; @@ -3310,7 +3444,7 @@ void wxWin32Renderer::DrawScrollbarThumb(wxDC& dc, } void wxWin32Renderer::DrawScrollbarShaft(wxDC& dc, - wxOrientation orient, + wxOrientation WXUNUSED(orient), const wxRect& rectBar, int flags) { @@ -3493,7 +3627,6 @@ void wxWin32Renderer::DrawFrameTitleBar(wxDC& dc, DrawFrameButton(dc, x, y, wxTOPLEVEL_BUTTON_HELP, (specialButton == wxTOPLEVEL_BUTTON_HELP) ? specialButtonFlags : 0); - x -= FRAME_BUTTON_WIDTH; } } } @@ -3635,14 +3768,14 @@ void wxWin32Renderer::DrawFrameButton(wxDC& dc, DrawShadedRect(dc, &r, m_penBlack, m_penHighlight); DrawShadedRect(dc, &r, m_penDarkGrey, m_penLightGrey); DrawBackground(dc, wxSCHEME_COLOUR(m_scheme, CONTROL), r); - dc.DrawBitmap(m_bmpFrameButtons[idx], r.x+1, r.y+1, TRUE); + dc.DrawBitmap(m_bmpFrameButtons[idx], r.x+1, r.y+1, true); } else { DrawShadedRect(dc, &r, m_penHighlight, m_penBlack); DrawShadedRect(dc, &r, m_penLightGrey, m_penDarkGrey); DrawBackground(dc, wxSCHEME_COLOUR(m_scheme, CONTROL), r); - dc.DrawBitmap(m_bmpFrameButtons[idx], r.x, r.y, TRUE); + dc.DrawBitmap(m_bmpFrameButtons[idx], r.x, r.y, true); } } @@ -3919,8 +4052,9 @@ static inline int GetTextBorderWidth() return 1; } -wxRect wxWin32Renderer::GetTextTotalArea(const wxTextCtrl *text, - const wxRect& rect) const +wxRect +wxWin32Renderer::GetTextTotalArea(const wxTextCtrl * WXUNUSED(text), + const wxRect& rect) const { wxRect rectTotal = rect; @@ -3933,9 +4067,10 @@ wxRect wxWin32Renderer::GetTextTotalArea(const wxTextCtrl *text, return rectTotal; } -wxRect wxWin32Renderer::GetTextClientArea(const wxTextCtrl *text, - const wxRect& rect, - wxCoord *extraSpaceBeyond) const +wxRect +wxWin32Renderer::GetTextClientArea(const wxTextCtrl * WXUNUSED(text), + const wxRect& rect, + wxCoord *extraSpaceBeyond) const { wxRect rectText = rect; @@ -3988,6 +4123,18 @@ void wxWin32Renderer::AdjustSize(wxSize *size, const wxWindow *window) size->y += 9; } + // for compatibility with other ports, the buttons default size is never + // less than the standard one, but not when display not PDAs. + if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA) + { + if ( !(window->GetWindowStyle() & wxBU_EXACTFIT) ) + { + wxSize szDef = wxButton::GetDefaultSize(); + if ( size->x < szDef.x ) + size->x = szDef.x; + } + } + // no border width adjustments for buttons return; } @@ -4012,11 +4159,11 @@ wxWin32InputHandler::wxWin32InputHandler(wxWin32Renderer *renderer) m_renderer = renderer; } -bool wxWin32InputHandler::HandleKey(wxInputConsumer *control, - const wxKeyEvent& event, - bool pressed) +bool wxWin32InputHandler::HandleKey(wxInputConsumer * WXUNUSED(control), + const wxKeyEvent& WXUNUSED(event), + bool WXUNUSED(pressed)) { - return FALSE; + return false; } bool wxWin32InputHandler::HandleMouse(wxInputConsumer *control, @@ -4032,11 +4179,11 @@ bool wxWin32InputHandler::HandleMouse(wxInputConsumer *control, { win->SetFocus(); - return TRUE; + return true; } } - return FALSE; + return false; } // ---------------------------------------------------------------------------- @@ -4048,7 +4195,7 @@ wxWin32ScrollBarInputHandler(wxWin32Renderer *renderer, wxInputHandler *handler) : wxStdScrollBarInputHandler(renderer, handler) { - m_scrollPaused = FALSE; + m_scrollPaused = false; m_interval = 0; } @@ -4057,7 +4204,7 @@ bool wxWin32ScrollBarInputHandler::OnScrollTimer(wxScrollBar *scrollbar, { // stop if went beyond the position of the original click (this can only // happen when we scroll by pages) - bool stop = FALSE; + bool stop = false; if ( action == wxACTION_SCROLL_PAGE_DOWN ) { stop = m_renderer->HitTestScrollbar(scrollbar, m_ptStartScrolling) @@ -4075,7 +4222,7 @@ bool wxWin32ScrollBarInputHandler::OnScrollTimer(wxScrollBar *scrollbar, scrollbar->Refresh(); - return FALSE; + return false; } return wxStdScrollBarInputHandler::OnScrollTimer(scrollbar, action); @@ -4108,12 +4255,12 @@ bool wxWin32ScrollBarInputHandler::HandleMouseMove(wxInputConsumer *control, // mouse move events normally - only do it while mouse is captured (i.e. // when we're dragging the thumb or pressing on something) if ( !m_winCapture ) - return FALSE; + return false; if ( event.Entering() ) { // we're not interested in this at all - return FALSE; + return false; } wxScrollBar *scrollbar = wxStaticCast(control->GetInputWindow(), wxScrollBar); @@ -4125,20 +4272,20 @@ bool wxWin32ScrollBarInputHandler::HandleMouseMove(wxInputConsumer *control, if ( event.Leaving() ) { // it surely didn't - return FALSE; + return false; } ht = m_renderer->HitTestScrollbar(scrollbar, event.GetPosition()); if ( ht == m_htLast ) { // yes it did, resume scrolling - m_scrollPaused = FALSE; + m_scrollPaused = false; if ( m_timerScroll ) { // we were scrolling by line/page, restart timer m_timerScroll->Start(m_interval); - Press(scrollbar, TRUE); + Press(scrollbar, true); } else // we were dragging the thumb { @@ -4146,7 +4293,7 @@ bool wxWin32ScrollBarInputHandler::HandleMouseMove(wxInputConsumer *control, HandleThumbMove(scrollbar, m_eventLastDrag); } - return TRUE; + return true; } } else // normal case, scrolling hasn't been paused @@ -4198,10 +4345,10 @@ bool wxWin32ScrollBarInputHandler::HandleMouseMove(wxInputConsumer *control, // pause scrolling m_interval = m_timerScroll->GetInterval(); m_timerScroll->Stop(); - m_scrollPaused = TRUE; + m_scrollPaused = true; // unpress the arrow - Press(scrollbar, FALSE); + Press(scrollbar, false); } else // we were dragging the thumb { @@ -4214,7 +4361,7 @@ bool wxWin32ScrollBarInputHandler::HandleMouseMove(wxInputConsumer *control, HandleThumbMove(scrollbar, m_eventStartDrag); } - return TRUE; + return true; } } @@ -4251,15 +4398,15 @@ bool wxWin32CheckboxInputHandler::HandleKey(wxInputConsumer *control, break; } - if ( !!action ) + if ( !action.IsEmpty() ) { control->PerformAction(action); - return TRUE; + return true; } } - return FALSE; + return false; } // ---------------------------------------------------------------------------- @@ -4293,7 +4440,7 @@ bool wxWin32TextCtrlInputHandler::HandleKey(wxInputConsumer *control, { control->PerformAction(action); - return TRUE; + return true; } } @@ -4308,7 +4455,7 @@ wxWin32StatusBarInputHandler:: wxWin32StatusBarInputHandler(wxInputHandler *handler) : wxStdInputHandler(handler) { - m_isOnGrip = FALSE; + m_isOnGrip = false; } bool wxWin32StatusBarInputHandler::IsOnGrip(wxWindow *statbar, @@ -4320,7 +4467,7 @@ bool wxWin32StatusBarInputHandler::IsOnGrip(wxWindow *statbar, wxTopLevelWindow * parentTLW = wxDynamicCast(statbar->GetParent(), wxTopLevelWindow); - wxCHECK_MSG( parentTLW, FALSE, + wxCHECK_MSG( parentTLW, false, _T("the status bar should be a child of a TLW") ); // a maximized window can't be resized anyhow @@ -4338,7 +4485,7 @@ bool wxWin32StatusBarInputHandler::IsOnGrip(wxWindow *statbar, } } - return FALSE; + return false; } bool wxWin32StatusBarInputHandler::HandleMouse(wxInputConsumer *consumer, @@ -4361,7 +4508,7 @@ bool wxWin32StatusBarInputHandler::HandleMouse(wxInputConsumer *consumer, statbar->SetCursor(m_cursorOld); - return TRUE; + return true; } } } @@ -4413,7 +4560,9 @@ private: wxWin32FrameInputHandler *m_inputHnd; wxTopLevelWindow *m_wnd; +#if wxUSE_ACCEL wxAcceleratorTable m_oldAccelTable; +#endif }; wxWin32SystemMenuEvtHandler::wxWin32SystemMenuEvtHandler( @@ -4430,6 +4579,7 @@ void wxWin32SystemMenuEvtHandler::Attach(wxInputConsumer *consumer) m_wnd = wxStaticCast(consumer->GetInputWindow(), wxTopLevelWindow); m_wnd->PushEventHandler(this); +#if wxUSE_ACCEL // VS: This code relies on using generic implementation of // wxAcceleratorTable in wxUniv! wxAcceleratorTable table = *m_wnd->GetAcceleratorTable(); @@ -4437,13 +4587,16 @@ void wxWin32SystemMenuEvtHandler::Attach(wxInputConsumer *consumer) table.Add(wxAcceleratorEntry(wxACCEL_ALT, WXK_SPACE, wxID_SYSTEM_MENU)); table.Add(wxAcceleratorEntry(wxACCEL_ALT, WXK_F4, wxID_CLOSE_FRAME)); m_wnd->SetAcceleratorTable(table); +#endif } void wxWin32SystemMenuEvtHandler::Detach() { if ( m_wnd ) { +#if wxUSE_ACCEL m_wnd->SetAcceleratorTable(m_oldAccelTable); +#endif m_wnd->RemoveEventHandler(this); m_wnd = NULL; } @@ -4465,10 +4618,16 @@ void wxWin32SystemMenuEvtHandler::OnSystemMenu(wxCommandEvent &WXUNUSED(event)) pt.x = -pt.x + border; pt.y = -pt.y + border + FRAME_TITLEBAR_HEIGHT; +#if wxUSE_ACCEL wxAcceleratorTable table = *m_wnd->GetAcceleratorTable(); m_wnd->SetAcceleratorTable(wxNullAcceleratorTable); +#endif + m_inputHnd->PopupSystemMenu(m_wnd, pt); + +#if wxUSE_ACCEL m_wnd->SetAcceleratorTable(table); +#endif } void wxWin32SystemMenuEvtHandler::OnCloseFrame(wxCommandEvent &WXUNUSED(event)) @@ -4514,7 +4673,7 @@ bool wxWin32FrameInputHandler::HandleMouse(wxInputConsumer *consumer, tlw->PerformAction(wxACTION_TOPLEVEL_BUTTON_CLICK, tlw->IsMaximized() ? wxTOPLEVEL_BUTTON_RESTORE : wxTOPLEVEL_BUTTON_MAXIMIZE); - return TRUE; + return true; } else if ( tlw->GetWindowStyle() & wxSYSTEM_MENU ) { @@ -4524,7 +4683,7 @@ bool wxWin32FrameInputHandler::HandleMouse(wxInputConsumer *consumer, hit == wxHT_TOPLEVEL_ICON)) ) { PopupSystemMenu(tlw, event.GetPosition()); - return TRUE; + return true; } } } @@ -4553,13 +4712,13 @@ void wxWin32FrameInputHandler::PopupSystemMenu(wxTopLevelWindow *window, { if ( window->IsMaximized() ) { - menu->Enable(wxID_MAXIMIZE_FRAME, FALSE); - menu->Enable(wxID_MOVE_FRAME, FALSE); + menu->Enable(wxID_MAXIMIZE_FRAME, false); + menu->Enable(wxID_MOVE_FRAME, false); if ( window->GetWindowStyle() & wxRESIZE_BORDER ) - menu->Enable(wxID_RESIZE_FRAME, FALSE); + menu->Enable(wxID_RESIZE_FRAME, false); } else - menu->Enable(wxID_RESTORE_FRAME, FALSE); + menu->Enable(wxID_RESTORE_FRAME, false); } window->PopupMenu(menu, pos);