X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/490da436c859b499a7726acd06af02304b0d925f..095b80e2b5120d4c476a834b2017c355fa9afef0:/src/univ/themes/metal.cpp diff --git a/src/univ/themes/metal.cpp b/src/univ/themes/metal.cpp index 9cc918b5bf..31f9136b15 100644 --- a/src/univ/themes/metal.cpp +++ b/src/univ/themes/metal.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 /////////////////////////////////////////////////////////////////////////////// // =========================================================================== @@ -87,10 +87,10 @@ public: wxMetalRenderer(wxRenderer *renderer, wxColourScheme* scheme); virtual void DrawButtonSurface(wxDC& dc, - const wxColour& col, + const wxColour& WXUNUSED(col), const wxRect& rect, - int flags ) - { DrawMetal( dc, rect ); } + int WXUNUSED(flags)) + { DrawMetal(dc, rect); } virtual void DrawScrollbarThumb(wxDC& dc, wxOrientation orient, @@ -141,7 +141,7 @@ private: // wxMetalTheme // ---------------------------------------------------------------------------- -WX_DEFINE_ARRAY(wxInputHandler *, wxArrayHandlers); +WX_DEFINE_ARRAY_PTR(wxInputHandler *, wxArrayHandlers); class wxMetalTheme : public wxTheme { @@ -157,8 +157,8 @@ private: bool GetOrCreateTheme() { if ( !m_win32Theme ) - m_win32Theme = wxTheme::Create("win32"); - return m_win32Theme; + m_win32Theme = wxTheme::Create( wxT("win32") ); + return m_win32Theme != NULL; } private: wxTheme *m_win32Theme; @@ -406,9 +406,9 @@ wxMetalRenderer::wxMetalRenderer(wxRenderer *renderer, wxColourScheme *scheme) } void wxMetalRenderer::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; @@ -417,15 +417,15 @@ void wxMetalRenderer::DrawScrollbarThumb(wxDC& dc, } void wxMetalRenderer::DrawScrollbarShaft(wxDC& dc, - wxOrientation orient, + wxOrientation WXUNUSED(orient), const wxRect& rectBar, - int flags) + int WXUNUSED(flags)) { - DrawMetal( dc, rectBar ); + DrawMetal(dc, rectBar); } void wxMetalRenderer::GetComboBitmaps(wxBitmap *bmpNormal, - wxBitmap *bmpFocus, + wxBitmap * WXUNUSED(bmpFocus), wxBitmap *bmpPressed, wxBitmap *bmpDisabled) {