X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/136d4499d546b9afdfaf5aea37e42f6ded806790..c0b0635cf69537ca32377bad5650b39402cb21b6:/src/univ/themes/gtk.cpp diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp index b3a5c59d4a..098e4d0960 100644 --- a/src/univ/themes/gtk.cpp +++ b/src/univ/themes/gtk.cpp @@ -6,7 +6,7 @@ // Created: 06.08.00 // RCS-ID: $Id$ // Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // =========================================================================== @@ -42,6 +42,7 @@ #include "wx/slider.h" #include "wx/textctrl.h" #include "wx/toolbar.h" + #include "wx/statusbr.h" #include "wx/settings.h" #endif // WX_PRECOMP @@ -165,7 +166,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, @@ -184,21 +186,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); - virtual void DrawSliderTicks(wxDC& dc, - const wxRect& rect, - const wxSize& sizeThumb, - wxOrientation orient, - int start, - int end, - int step, - int flags) + int flags = 0, + long style = 0); + virtual void DrawSliderTicks(wxDC& WXUNUSED(dc), + const wxRect& WXUNUSED(rect), + int WXUNUSED(lenThumb), + wxOrientation WXUNUSED(orient), + int WXUNUSED(start), + int WXUNUSED(end), + int WXUNUSED(step) = 1, + int WXUNUSED(flags) = 0, + long WXUNUSED(style) = 0) { // we don't have the ticks in GTK version } @@ -223,7 +229,7 @@ public: virtual void DrawStatusField(wxDC& dc, const wxRect& rect, const wxString& label, - int flags = 0); + int flags = 0, int style = 0); virtual void DrawFrameTitleBar(wxDC& dc, const wxRect& rect, @@ -305,8 +311,11 @@ public: virtual wxCoord GetSliderDim() const { return 15; } virtual wxCoord GetSliderTickLen() const { return 0; } 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); } @@ -525,7 +534,7 @@ protected: wxStdScrollBarInputHandler::Press(scrollbar, doIt); } - virtual bool IsAllowedButton(int WXUNUSED(button)) { return TRUE; } + virtual bool IsAllowedButton(int WXUNUSED(button)) { return true; } bool IsArrow() const { @@ -583,7 +592,7 @@ protected: // wxGTKTheme // ---------------------------------------------------------------------------- -WX_DEFINE_ARRAY(wxInputHandler *, wxArrayHandlers); +WX_DEFINE_ARRAY_PTR(wxInputHandler *, wxArrayHandlers); class wxGTKTheme : public wxTheme { @@ -767,7 +776,7 @@ wxColour wxGTKColourScheme::GetBackground(wxWindow *win) const col = win->GetBackgroundColour(); } - if ( win->IsContainerWindow() ) + if ( !win->ShouldInheritColours() ) { // doesn't depend on the state if ( !col.Ok() ) @@ -972,7 +981,7 @@ void wxGTKRenderer::DrawAntiRaisedBorder(wxDC& dc, wxRect *rect) void wxGTKRenderer::DrawBorder(wxDC& dc, wxBorder border, const wxRect& rectTotal, - int flags, + int WXUNUSED(flags), wxRect *rectIn) { size_t width; @@ -1073,7 +1082,7 @@ wxRect wxGTKRenderer::GetBorderDimensions(wxBorder border) const bool wxGTKRenderer::AreScrollbarsInsideBorder() const { // no, the scrollbars are outside the border in GTK+ - return FALSE; + return false; } // ---------------------------------------------------------------------------- @@ -1396,13 +1405,13 @@ void wxGTKRenderer::DrawRadioBitmap(wxDC& dc, DrawUpZag(dc, x, xRight, yMid, y); DrawUpZag(dc, x + 1, xRight - 1, yMid, y + 1); - bool drawIt = TRUE; + bool drawIt = true; if ( flags & wxCONTROL_CHECKED ) dc.SetPen(m_penBlack); else if ( flags & wxCONTROL_PRESSED ) dc.SetPen(wxPen(wxSCHEME_COLOUR(m_scheme, CONTROL_PRESSED), 0, wxSOLID)); else // unchecked and unpressed - drawIt = FALSE; + drawIt = false; if ( drawIt ) DrawUpZag(dc, x + 2, xRight - 2, yMid, y + 2); @@ -1415,14 +1424,14 @@ void wxGTKRenderer::DrawRadioBitmap(wxDC& dc, DrawDownZag(dc, x + 1, xRight - 1, yMid, yBottom - 1); if ( !(flags & wxCONTROL_CHECKED) ) - drawIt = TRUE; // with the same pen + drawIt = true; // with the same pen else if ( flags & wxCONTROL_PRESSED ) { dc.SetPen(wxPen(wxSCHEME_COLOUR(m_scheme, CONTROL_PRESSED), 0, wxSOLID)); - drawIt = TRUE; + drawIt = true; } else // checked and unpressed - drawIt = FALSE; + drawIt = false; if ( drawIt ) DrawDownZag(dc, x + 2, xRight - 2, yMid, yBottom - 2); @@ -1473,14 +1482,14 @@ wxBitmap wxGTKRenderer::GetCheckBitmap(int flags) // normal unchecked dc.SelectObject(m_bitmapsCheckbox[0][1]); - DrawUncheckBitmap(dc, rect, FALSE); + DrawUncheckBitmap(dc, rect, false); // pressed checked m_bitmapsCheckbox[1][0] = m_bitmapsCheckbox[0][0]; // pressed unchecked dc.SelectObject(m_bitmapsCheckbox[1][1]); - DrawUncheckBitmap(dc, rect, TRUE); + DrawUncheckBitmap(dc, rect, true); } int row = flags & wxCONTROL_PRESSED ? 1 : 0; @@ -1579,7 +1588,7 @@ void wxGTKRenderer::DoDrawCheckOrRadioBitmap(wxDC& dc, rectLabel.SetRight(rect.GetRight()); } - dc.DrawBitmap(bitmap, xBmp, yBmp, TRUE /* use mask */); + dc.DrawBitmap(bitmap, xBmp, yBmp, true /* use mask */); DrawLabel(dc, label, rectLabel, flags, wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL, indexAccel); @@ -1625,7 +1634,8 @@ void wxGTKRenderer::DrawToolBarButton(wxDC& dc, const wxString& label, const wxBitmap& bitmap, const wxRect& rectOrig, - int flags) + int flags, + long WXUNUSED(style)) { // we don't draw the separators at all if ( !label.empty() || bitmap.Ok() ) @@ -1654,7 +1664,7 @@ void wxGTKRenderer::DrawToolBarButton(wxDC& dc, // text control // ---------------------------------------------------------------------------- -wxRect wxGTKRenderer::GetTextTotalArea(const wxTextCtrl *text, +wxRect wxGTKRenderer::GetTextTotalArea(const wxTextCtrl * WXUNUSED(text), const wxRect& rect) const { wxRect rectTotal = rect; @@ -1865,13 +1875,14 @@ void wxGTKRenderer::DrawTab(wxDC& dc, // ---------------------------------------------------------------------------- wxSize wxGTKRenderer::GetSliderThumbSize(const wxRect& rect, + int lenThumb, wxOrientation orient) const { static const wxCoord SLIDER_THUMB_LENGTH = 30; wxSize size; - wxRect rectShaft = GetSliderShaftRect(rect, orient); + wxRect rectShaft = GetSliderShaftRect(rect, lenThumb, orient); if ( orient == wxHORIZONTAL ) { size.x = wxMin(SLIDER_THUMB_LENGTH, rectShaft.width); @@ -1887,15 +1898,19 @@ wxSize wxGTKRenderer::GetSliderThumbSize(const wxRect& rect, } wxRect wxGTKRenderer::GetSliderShaftRect(const wxRect& rect, - wxOrientation WXUNUSED(orient)) const + int WXUNUSED(lenThumb), + wxOrientation WXUNUSED(orient), + long WXUNUSED(style)) const { return rect.Deflate(2*BORDER_THICKNESS, 2*BORDER_THICKNESS); } void wxGTKRenderer::DrawSliderShaft(wxDC& dc, const wxRect& rectOrig, - wxOrientation orient, + int WXUNUSED(lenThumb), + wxOrientation WXUNUSED(orient), int flags, + long WXUNUSED(style), wxRect *rectShaft) { wxRect rect = rectOrig; @@ -1922,7 +1937,8 @@ void wxGTKRenderer::DrawSliderShaft(wxDC& dc, void wxGTKRenderer::DrawSliderThumb(wxDC& dc, const wxRect& rectOrig, wxOrientation orient, - int flags) + int WXUNUSED(flags), + long WXUNUSED(style)) { // draw the thumb border wxRect rect = rectOrig; @@ -2140,7 +2156,7 @@ wxMenuGeometryInfo *wxGTKRenderer::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() ) { @@ -2212,15 +2228,16 @@ wxMenuGeometryInfo *wxGTKRenderer::GetMenuGeometry(wxWindow *win, // status bar // ---------------------------------------------------------------------------- -wxSize wxGTKRenderer::GetStatusBarBorders(wxCoord *borderBetweenFields) const +wxSize +wxGTKRenderer::GetStatusBarBorders(wxCoord * WXUNUSED(borderBetweenFields)) const { return wxSize(0, 0); } -void wxGTKRenderer::DrawStatusField(wxDC& dc, - const wxRect& rect, - const wxString& label, - int flags) +void wxGTKRenderer::DrawStatusField(wxDC& WXUNUSED(dc), + const wxRect& WXUNUSED(rect), + const wxString& WXUNUSED(label), + int WXUNUSED(flags), int WXUNUSED(style)) { } @@ -2289,7 +2306,7 @@ void wxGTKRenderer::GetComboBitmaps(wxBitmap *bmpNormal, void wxGTKRenderer::DoDrawBackground(wxDC& dc, const wxColour& col, const wxRect& rect, - wxWindow *window ) + wxWindow * WXUNUSED(window)) { wxBrush brush(col, wxSOLID); dc.SetBrush(brush); @@ -2635,7 +2652,7 @@ void wxGTKRenderer::DrawScrollbarThumb(wxDC& dc, void wxGTKRenderer::DrawScrollbarShaft(wxDC& dc, wxOrientation orient, const wxRect& rect, - int flags) + int WXUNUSED(flags)) { wxRect rectBar = rect; DrawThumbBorder(dc, &rectBar, orient); @@ -2741,70 +2758,78 @@ void wxGTKRenderer::AdjustSize(wxSize *size, const wxWindow *window) // top level windows // ---------------------------------------------------------------------------- -void wxGTKRenderer::DrawFrameTitleBar(wxDC& dc, - const wxRect& rect, - const wxString& title, - const wxIcon& icon, - int flags, - int specialButton, - int specialButtonFlag) +void wxGTKRenderer::DrawFrameTitleBar(wxDC& WXUNUSED(dc), + const wxRect& WXUNUSED(rect), + const wxString& WXUNUSED(title), + const wxIcon& WXUNUSED(icon), + int WXUNUSED(flags), + int WXUNUSED(specialButton), + int WXUNUSED(specialButtonFlag)) { } -void wxGTKRenderer::DrawFrameBorder(wxDC& dc, - const wxRect& rect, - int flags) +void wxGTKRenderer::DrawFrameBorder(wxDC& WXUNUSED(dc), + const wxRect& WXUNUSED(rect), + int WXUNUSED(flags)) { } -void wxGTKRenderer::DrawFrameBackground(wxDC& dc, - const wxRect& rect, - int flags) +void wxGTKRenderer::DrawFrameBackground(wxDC& WXUNUSED(dc), + const wxRect& WXUNUSED(rect), + int WXUNUSED(flags)) { } -void wxGTKRenderer::DrawFrameTitle(wxDC& dc, - const wxRect& rect, - const wxString& title, - int flags) +void wxGTKRenderer::DrawFrameTitle(wxDC& WXUNUSED(dc), + const wxRect& WXUNUSED(rect), + const wxString& WXUNUSED(title), + int WXUNUSED(flags)) { } -void wxGTKRenderer::DrawFrameIcon(wxDC& dc, - const wxRect& rect, - const wxIcon& icon, - int flags) +void wxGTKRenderer::DrawFrameIcon(wxDC& WXUNUSED(dc), + const wxRect& WXUNUSED(rect), + const wxIcon& WXUNUSED(icon), + int WXUNUSED(flags)) { } -void wxGTKRenderer::DrawFrameButton(wxDC& dc, - wxCoord x, wxCoord y, - int button, - int flags) +void wxGTKRenderer::DrawFrameButton(wxDC& WXUNUSED(dc), + wxCoord WXUNUSED(x), + wxCoord WXUNUSED(y), + int WXUNUSED(button), + int WXUNUSED(flags)) { } -wxRect wxGTKRenderer::GetFrameClientArea(const wxRect& rect, int flags) const +wxRect +wxGTKRenderer::GetFrameClientArea(const wxRect& rect, + int WXUNUSED(flags)) const { return rect; } -wxSize wxGTKRenderer::GetFrameTotalSize(const wxSize& clientSize, int flags) const +wxSize +wxGTKRenderer::GetFrameTotalSize(const wxSize& clientSize, + int WXUNUSED(flags)) const { return clientSize; } -wxSize wxGTKRenderer::GetFrameMinSize(int flags) const +wxSize wxGTKRenderer::GetFrameMinSize(int WXUNUSED(flags)) const { return wxSize(0,0); } wxSize wxGTKRenderer::GetFrameIconSize() const { - return wxSize(-1, -1); + return wxSize(wxDefaultCoord, wxDefaultCoord); } -int wxGTKRenderer::HitTestFrame(const wxRect& rect, const wxPoint& pt, int flags) const +int +wxGTKRenderer::HitTestFrame(const wxRect& WXUNUSED(rect), + const wxPoint& WXUNUSED(pt), + int WXUNUSED(flags)) const { return wxHT_TOPLEVEL_CLIENT_AREA; } @@ -4447,11 +4472,11 @@ wxGTKInputHandler::wxGTKInputHandler(wxGTKRenderer *renderer) m_renderer = renderer; } -bool wxGTKInputHandler::HandleKey(wxInputConsumer *control, - const wxKeyEvent& event, - bool pressed) +bool wxGTKInputHandler::HandleKey(wxInputConsumer * WXUNUSED(control), + const wxKeyEvent& WXUNUSED(event), + bool WXUNUSED(pressed)) { - return FALSE; + return false; } bool wxGTKInputHandler::HandleMouse(wxInputConsumer *control, @@ -4462,10 +4487,10 @@ bool wxGTKInputHandler::HandleMouse(wxInputConsumer *control, { control->GetInputWindow()->SetFocus(); - return TRUE; + return true; } - return FALSE; + return false; } bool wxGTKInputHandler::HandleMouseMove(wxInputConsumer *control, @@ -4473,18 +4498,18 @@ bool wxGTKInputHandler::HandleMouseMove(wxInputConsumer *control, { if ( event.Entering() ) { - control->GetInputWindow()->SetCurrent(TRUE); + control->GetInputWindow()->SetCurrent(true); } else if ( event.Leaving() ) { - control->GetInputWindow()->SetCurrent(FALSE); + control->GetInputWindow()->SetCurrent(false); } else { - return FALSE; + return false; } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -4502,11 +4527,11 @@ bool wxGTKCheckboxInputHandler::HandleKey(wxInputConsumer *control, { control->PerformAction(wxACTION_CHECKBOX_TOGGLE); - return TRUE; + return true; } } - return FALSE; + return false; } // ---------------------------------------------------------------------------- @@ -4596,7 +4621,7 @@ bool wxGTKTextCtrlInputHandler::HandleKey(wxInputConsumer *control, { control->PerformAction(action); - return TRUE; + return true; } }