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 d45e65ae0ebb4aadf8b2ab597b50c019898a0e34..3ca35e91ef1a0d47f3524833811cd495d34f71ed 100644 (file)
--- a/include/wx/univ/renderer.h
+++ b/include/wx/univ/renderer.h
@@ -9,8 +9,11 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_UNIV_RENDERER_H_
+#define _WX_UNIV_RENDERER_H_
+
 /*
-   wxRenderer class is used to draw all wxWindows controls. This is an ABC and
+   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 used in the program.
 
@@ -25,13 +28,6 @@
    implementation of the latter or reimplement itself).
  */
 
-#ifdef __GNUG__
-    #pragma interface "renderer.h"
-#endif
-
-#ifndef _WX_UNIV_RENDERER_H_
-#define _WX_UNIV_RENDERER_H_
-
 #include "wx/renderer.h"
 
 class WXDLLEXPORT wxDC;
@@ -84,7 +80,7 @@ public:
                                 const wxRect& rect,
                                 int flags )
         { DrawBackground( dc, col, rect, flags ); }
-                                
+
 
     // draw the label inside the given rectangle with the specified alignment
     // and optionally emphasize the character with the given index
@@ -115,7 +111,7 @@ public:
                             wxRect *rectIn = (wxRect *)NULL) = 0;
 
     // draw text control border (I hate to have a separate method for this but
-    // it is needed to accomodate GTK+)
+    // it is needed to accommodate GTK+)
     virtual void DrawTextBorder(wxDC& dc,
                                 wxBorder border,
                                 const wxRect& rect,
@@ -210,7 +206,8 @@ public:
                                    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,
@@ -288,7 +285,7 @@ public:
     virtual void DrawStatusField(wxDC& dc,
                                  const wxRect& rect,
                                  const wxString& label,
-                                 int flags = 0) = 0;
+                                 int flags = 0, int style = 0) = 0;
 
     // draw complete frame/dialog titlebar
     virtual void DrawFrameTitleBar(wxDC& dc,
@@ -630,8 +627,9 @@ public:
                                    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,
@@ -701,8 +699,8 @@ public:
     virtual void DrawStatusField(wxDC& dc,
                                  const wxRect& rect,
                                  const wxString& label,
-                                 int flags = 0)
-        { m_renderer->DrawStatusField(dc, rect, label, flags); }
+                                 int flags = 0, int style = 0)
+        { m_renderer->DrawStatusField(dc, rect, label, flags, style); }
 
     virtual void DrawFrameTitleBar(wxDC& dc,
                                    const wxRect& rect,
@@ -897,7 +895,7 @@ private:
     // common part of DrawItems() and DrawCheckItems()
     void DoDrawItems(const wxListBox *listbox,
                      size_t itemFirst, size_t itemLast,
-                     bool isCheckLbox = FALSE);
+                     bool isCheckLbox = false);
 
     wxWindow *m_window;
     wxRenderer *m_renderer;
@@ -906,4 +904,3 @@ private:
 };
 
 #endif // _WX_UNIV_RENDERER_H_
-