Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / interface / wx / panel.h

diff --git a/interface/wx/panel.h b/interface/wx/panel.h
index d34d0ae42712ed41c8bb6add073b00bf85d67276..cc65780d6624fd0cfd62a5bb4d0cdbd82ec30ad4 100644 (file)
--- a/interface/wx/panel.h
+++ b/interface/wx/panel.h
@@ -108,7 +108,7 @@ public:
     virtual bool Layout();
 
     /**
     virtual bool Layout();
 
     /**

-        The default handler for wxEVT_SYS_COLOUR_CHANGED.
+        The default handler for @c wxEVT_SYS_COLOUR_CHANGED.

 
         @param event
             The colour change event.
 
         @param event
             The colour change event.


@@ -124,6 +124,21 @@ public:
     */
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
     */
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 

+    /**
+        Set the background bitmap for this panel.
+
+        If @a bmp is a valid bitmap, this bitmap will be tiled over the panel
+        background and show through any of its transparent children. Passing an
+        invalid bitmap reverts to the default background appearance.
+
+        Notice that you must not prevent the base class EVT_ERASE_BACKGROUND
+        handler from running (i.e. not to handle this event yourself) for this
+        to work.
+
+        @since 2.9.2
+    */
+    void SetBackgroundBitmap(const wxBitmap& bmp);
+

     /**
         Overrides wxWindow::SetFocus().
 
     /**
         Overrides wxWindow::SetFocus().