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 f836f6c6a1f35557f7c1fa843504ee3c72c88d30..cc65780d6624fd0cfd62a5bb4d0cdbd82ec30ad4 100644 (file)
--- a/interface/wx/panel.h
+++ b/interface/wx/panel.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxPanel
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -26,6 +26,11 @@
 
     @remarks By default, a panel has the same colouring as a dialog.
 
+    @beginEventEmissionTable{wxNavigationKeyEvent}
+    @event{EVT_NAVIGATION_KEY(func)}
+        Process a navigation key event.
+    @endEventTable
+
     @library{wxbase}
     @category{miscwnd}
 
@@ -48,10 +53,10 @@ public:
         @param id
             An identifier for the panel. @c wxID_ANY is taken to mean a default.
         @param pos
-            The panel position. The value @c wxDefaultPosition indicates a default position,
+            The panel position. The value ::wxDefaultPosition indicates a default position,
             chosen by either the windowing system or wxWidgets, depending on platform.
         @param size
-            The panel size. The value @c wxDefaultSize indicates a default size, chosen by
+            The panel size. The value ::wxDefaultSize indicates a default size, chosen by
             either the windowing system or wxWidgets, depending on platform.
         @param style
             The window style. See wxPanel.
@@ -103,7 +108,7 @@ public:
     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.
@@ -119,6 +124,21 @@ public:
     */
     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().