Build fix for OW regarding & operator needing full class specs.

[wxWidgets.git] / include / wx / univ / renderer.h

diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h
index 8024c825b9b6b3e277404c8840ae62ff1c273883..3ca35e91ef1a0d47f3524833811cd495d34f71ed 100644 (file)
--- a/include/wx/univ/renderer.h
+++ b/include/wx/univ/renderer.h
@@ -9,6 +9,9 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_UNIV_RENDERER_H_
+#define _WX_UNIV_RENDERER_H_
+

 /*
    wxRenderer class is used to draw all wxWidgets controls. This is an ABC and
    the look of the application is determined by the concrete derivation of
 /*
    wxRenderer class is used to draw all wxWidgets controls. This is an ABC and
    the look of the application is determined by the concrete derivation of


@@ -25,9 +28,6 @@
    implementation of the latter or reimplement itself).
  */
 
    implementation of the latter or reimplement itself).
  */
 

-#ifndef _WX_UNIV_RENDERER_H_
-#define _WX_UNIV_RENDERER_H_
-

 #include "wx/renderer.h"
 
 class WXDLLEXPORT wxDC;
 #include "wx/renderer.h"
 
 class WXDLLEXPORT wxDC;


@@ -206,7 +206,8 @@ public:
                                    const wxBitmap& bitmap,
                                    const wxRect& rect,
                                    int flags = 0,
                                    const wxBitmap& bitmap,
                                    const wxRect& rect,
                                    int flags = 0,

-                                   long style = 0) = 0;
+                                   long style = 0,
+                                   int tbarStyle = 0) = 0;

 
     // draw a (part of) line in the text control
     virtual void DrawTextLine(wxDC& dc,
 
     // draw a (part of) line in the text control
     virtual void DrawTextLine(wxDC& dc,


@@ -626,8 +627,9 @@ public:
                                    const wxBitmap& bitmap,
                                    const wxRect& rect,
                                    int flags = 0,
                                    const wxBitmap& bitmap,
                                    const wxRect& rect,
                                    int flags = 0,

-                                   long style = 0)
-        { m_renderer->DrawToolBarButton(dc, label, bitmap, rect, flags, style); }
+                                   long style = 0,
+                                   int tbarStyle = 0)
+        { m_renderer->DrawToolBarButton(dc, label, bitmap, rect, flags, style, tbarStyle); }

     virtual void DrawTextLine(wxDC& dc,
                               const wxString& text,
                               const wxRect& rect,
     virtual void DrawTextLine(wxDC& dc,
                               const wxString& text,
                               const wxRect& rect,


@@ -902,4 +904,3 @@ private:
 };
 
 #endif // _WX_UNIV_RENDERER_H_
 };
 
 #endif // _WX_UNIV_RENDERER_H_

-