Added possibility of 2-step initialisation, and wxWIZARD_EX_HELPBUTTON style.

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

diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h
index 3304d277ea72b8744c1fc99a2127ed75fcaac618..5af129e218992cafb77988f392126140ad2c73ca 100644 (file)
--- a/include/wx/univ/renderer.h
+++ b/include/wx/univ/renderer.h
@@ -250,6 +250,7 @@ public:
 
     // return the bitmaps to use for combobox button
     virtual void GetComboBitmaps(wxBitmap *bmpNormal,
 
     // return the bitmaps to use for combobox button
     virtual void GetComboBitmaps(wxBitmap *bmpNormal,

+                                 wxBitmap *bmpFocus,

                                  wxBitmap *bmpPressed,
                                  wxBitmap *bmpDisabled) = 0;
 
                                  wxBitmap *bmpPressed,
                                  wxBitmap *bmpDisabled) = 0;
 


@@ -572,9 +573,11 @@ public:
         { m_renderer->DrawMenuSeparator(dc, y, geomInfo); }
 #endif
     virtual void GetComboBitmaps(wxBitmap *bmpNormal,
         { m_renderer->DrawMenuSeparator(dc, y, geomInfo); }
 #endif
     virtual void GetComboBitmaps(wxBitmap *bmpNormal,

+                                 wxBitmap *bmpFocus,

                                  wxBitmap *bmpPressed,
                                  wxBitmap *bmpDisabled)
                                  wxBitmap *bmpPressed,
                                  wxBitmap *bmpDisabled)

-        { m_renderer->GetComboBitmaps(bmpNormal, bmpPressed, bmpDisabled); }
+        { m_renderer->GetComboBitmaps(bmpNormal, bmpFocus,
+                                      bmpPressed, bmpDisabled); }

 
     virtual void AdjustSize(wxSize *size, const wxWindow *window)
         { m_renderer->AdjustSize(size, window); }
 
     virtual void AdjustSize(wxSize *size, const wxWindow *window)
         { m_renderer->AdjustSize(size, window); }