wxComboBox appearance fixes, looks fine now but doesn't really work under GTK

yet git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 15:07:52 +00:00
parent 1b4651028a
commit e4606ed9d0
20 changed files with 781 additions and 731 deletions
--- 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,
+                                 wxBitmap *bmpFocus,
                                 wxBitmap *bmpPressed,
                                 wxBitmap *bmpDisabled) = 0;

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