From 38c4cb6aa7677108cd1a7cd27a65df477588a778 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 20 Jul 2003 18:29:21 +0000 Subject: [PATCH] compilation fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/renderer.h | 4 ++++ src/generic/renderg.cpp | 46 ++++++++++++++++++++++--------------- src/gtk/renderer.cpp | 15 +++++++----- src/gtk1/renderer.cpp | 15 +++++++----- src/mac/carbon/renderer.cpp | 6 ++--- src/mac/renderer.cpp | 6 ++--- src/msw/renderer.cpp | 6 ++--- 7 files changed, 59 insertions(+), 39 deletions(-) diff --git a/include/wx/renderer.h b/include/wx/renderer.h index 449927ead8..325250d6ee 100644 --- a/include/wx/renderer.h +++ b/include/wx/renderer.h @@ -25,6 +25,10 @@ #ifndef _WX_RENDERER_H_ #define _WX_RENDERER_H_ +class WXDLLEXPORT wxDC; +class WXDLLEXPORT wxRect; +class WXDLLEXPORT wxWindow; + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index a37f9462b1..1e9af8886a 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Name: generic/renderg.cpp -// Purpose: generic implementation of wxRendererBase (for any platform) +// Purpose: generic implementation of wxRendererNative (for any platform) // Author: Vadim Zeitlin // Modified by: // Created: 20.07.2003 @@ -28,13 +28,18 @@ #include "wx/string.h" #endif //WX_PRECOMP +#include "wx/gdicmn.h" +#include "wx/dc.h" + +#include "wx/settings.h" + #include "wx/renderer.h" // ---------------------------------------------------------------------------- -// wxRendererGeneric: our wxRendererBase implementation +// wxRendererGeneric: our wxRendererNative implementation // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxRendererGeneric : public wxRendererBase +class WXDLLEXPORT wxRendererGeneric : public wxRendererNative { public: // draw the header control button (used by wxListCtrl) @@ -59,7 +64,7 @@ public: // ---------------------------------------------------------------------------- /* static */ -wxRendererNative *wxRendererGeneric::GetGeneric() +wxRendererNative& wxRendererNative::GetGeneric() { static wxRendererGeneric s_rendererGeneric; @@ -87,25 +92,30 @@ wxRendererGeneric::DrawHeaderButton(wxWindow *win, const wxRect& rect, int flags) { - const int m_corner = 1; + const int CORNER = 1; + + const wxCoord x = rect.x, + y = rect.y, + w = rect.width, + h = rect.height; - dc->SetBrush( *wxTRANSPARENT_BRUSH ); + dc.SetBrush( *wxTRANSPARENT_BRUSH ); - dc->SetPen( *wxBLACK_PEN ); - dc->DrawLine( x+w-m_corner+1, y, x+w, y+h ); // right (outer) - dc->DrawRectangle( x, y+h, w+1, 1 ); // bottom (outer) + dc.SetPen( *wxBLACK_PEN ); + dc.DrawLine( x+w-CORNER+1, y, x+w, y+h ); // right (outer) + dc.DrawRectangle( x, y+h, w+1, 1 ); // bottom (outer) wxPen pen( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID ); - dc->SetPen( pen ); - dc->DrawLine( x+w-m_corner, y, x+w-1, y+h ); // right (inner) - dc->DrawRectangle( x+1, y+h-1, w-2, 1 ); // bottom (inner) + dc.SetPen( pen ); + dc.DrawLine( x+w-CORNER, y, x+w-1, y+h ); // right (inner) + dc.DrawRectangle( x+1, y+h-1, w-2, 1 ); // bottom (inner) - dc->SetPen( *wxWHITE_PEN ); - dc->DrawRectangle( x, y, w-m_corner+1, 1 ); // top (outer) - dc->DrawRectangle( x, y, 1, h ); // left (outer) - dc->DrawLine( x, y+h-1, x+1, y+h-1 ); - dc->DrawLine( x+w-1, y, x+w-1, y+1 ); + dc.SetPen( *wxWHITE_PEN ); + dc.DrawRectangle( x, y, w-CORNER+1, 1 ); // top (outer) + dc.DrawRectangle( x, y, 1, h ); // left (outer) + dc.DrawLine( x, y+h-1, x+1, y+h-1 ); + dc.DrawLine( x+w-1, y, x+w-1, y+1 ); } // draw the plus or minus sign @@ -126,7 +136,7 @@ wxRendererGeneric::DrawTreeItemButton(wxWindow *win, dc.SetPen(*wxBLACK_PEN); dc.DrawLine(xMiddle - 2, yMiddle, xMiddle + 3, yMiddle); - if ( !item->IsExpanded() ) + if ( flags & wxCONTROL_EXPANDED ) { // turn "-" into "+" dc.DrawLine(xMiddle, yMiddle - 2, xMiddle, yMiddle + 3); diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index 77eee2e2fb..1ffc8b8def 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Name: gtk/renderer.cpp -// Purpose: implementation of wxRendererBase for wxGTK +// Purpose: implementation of wxRendererNative for wxGTK // Author: Vadim Zeitlin // Modified by: // Created: 20.07.2003 @@ -30,13 +30,15 @@ #include #include "wx/gtk/win_gtk.h" +#include "wx/window.h" +#include "wx/dc.h" #include "wx/renderer.h" // ---------------------------------------------------------------------------- -// wxRendererGTK: our wxRendererBase implementation +// wxRendererGTK: our wxRendererNative implementation // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxRendererGTK : public wxDelegateRendererBase +class WXDLLEXPORT wxRendererGTK : public wxDelegateRendererNative { public: // draw the header control button (used by wxListCtrl) @@ -60,7 +62,7 @@ public: // ============================================================================ /* static */ -wxRendererNative& wxRendererGTK::Get() +wxRendererNative& wxRendererNative::Get() { static wxRendererGTK s_rendererGTK; @@ -79,9 +81,10 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, GTK_PIZZA(win->m_wxwindow)->bin_window, flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL, GTK_SHADOW_OUT, - (GdkRectangle*) NULL, m_wxwindow, + (GdkRectangle*) NULL, + win->m_wxwindow, (char *)"button", // const_cast - dc.XLOG2DEV(rect.x) - 1, rect.y - 1, rect.width + 2, rect.h + 2 + dc.XLOG2DEV(rect.x) - 1, rect.y - 1, rect.width + 2, rect.height + 2 ); } diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp index 77eee2e2fb..1ffc8b8def 100644 --- a/src/gtk1/renderer.cpp +++ b/src/gtk1/renderer.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Name: gtk/renderer.cpp -// Purpose: implementation of wxRendererBase for wxGTK +// Purpose: implementation of wxRendererNative for wxGTK // Author: Vadim Zeitlin // Modified by: // Created: 20.07.2003 @@ -30,13 +30,15 @@ #include #include "wx/gtk/win_gtk.h" +#include "wx/window.h" +#include "wx/dc.h" #include "wx/renderer.h" // ---------------------------------------------------------------------------- -// wxRendererGTK: our wxRendererBase implementation +// wxRendererGTK: our wxRendererNative implementation // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxRendererGTK : public wxDelegateRendererBase +class WXDLLEXPORT wxRendererGTK : public wxDelegateRendererNative { public: // draw the header control button (used by wxListCtrl) @@ -60,7 +62,7 @@ public: // ============================================================================ /* static */ -wxRendererNative& wxRendererGTK::Get() +wxRendererNative& wxRendererNative::Get() { static wxRendererGTK s_rendererGTK; @@ -79,9 +81,10 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, GTK_PIZZA(win->m_wxwindow)->bin_window, flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL, GTK_SHADOW_OUT, - (GdkRectangle*) NULL, m_wxwindow, + (GdkRectangle*) NULL, + win->m_wxwindow, (char *)"button", // const_cast - dc.XLOG2DEV(rect.x) - 1, rect.y - 1, rect.width + 2, rect.h + 2 + dc.XLOG2DEV(rect.x) - 1, rect.y - 1, rect.width + 2, rect.height + 2 ); } diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp index aa92c55c2d..f295b9861a 100644 --- a/src/mac/carbon/renderer.cpp +++ b/src/mac/carbon/renderer.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Name: mac/renderer.cpp -// Purpose: implementation of wxRendererBase for Mac +// Purpose: implementation of wxRendererNative for Mac // Author: Vadim Zeitlin // Modified by: // Created: 20.07.2003 @@ -31,10 +31,10 @@ #include "wx/renderer.h" // ---------------------------------------------------------------------------- -// wxRendererMac: our wxRendererBase implementation +// wxRendererMac: our wxRendererNative implementation // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxRendererMac : public wxRendererBase +class WXDLLEXPORT wxRendererMac : public wxRendererNative { public: // draw the header control button (used by wxListCtrl) diff --git a/src/mac/renderer.cpp b/src/mac/renderer.cpp index aa92c55c2d..f295b9861a 100644 --- a/src/mac/renderer.cpp +++ b/src/mac/renderer.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Name: mac/renderer.cpp -// Purpose: implementation of wxRendererBase for Mac +// Purpose: implementation of wxRendererNative for Mac // Author: Vadim Zeitlin // Modified by: // Created: 20.07.2003 @@ -31,10 +31,10 @@ #include "wx/renderer.h" // ---------------------------------------------------------------------------- -// wxRendererMac: our wxRendererBase implementation +// wxRendererMac: our wxRendererNative implementation // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxRendererMac : public wxRendererBase +class WXDLLEXPORT wxRendererMac : public wxRendererNative { public: // draw the header control button (used by wxListCtrl) diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp index 315af1ef9e..f02d3780d3 100644 --- a/src/msw/renderer.cpp +++ b/src/msw/renderer.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Name: msw/renderer.cpp -// Purpose: implementation of wxRendererBase for Windows +// Purpose: implementation of wxRendererNative for Windows // Author: Vadim Zeitlin // Modified by: // Created: 20.07.2003 @@ -31,10 +31,10 @@ #include "wx/renderer.h" // ---------------------------------------------------------------------------- -// wxRendererMSW: our wxRendererBase implementation +// wxRendererMSW: our wxRendererNative implementation // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxRendererMSW : public wxDelegateRendererBase +class WXDLLEXPORT wxRendererMSW : public wxDelegateRendererNative { }; -- 2.45.2