Add NUM_CUSTOM

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

diff --git a/interface/wx/panel.h b/interface/wx/panel.h
index da65a95e3ce20b7195f1f532aa4e8ff8eee7f0d7..b1e83bd2233526e359db28b36886bc6b7f4f2d5b 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.
@@ -64,12 +69,12 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL,
-            const wxString& name = "panel");
+            const wxString& name = wxPanelNameStr);
 
     /**
         Destructor. Deletes any child windows before deleting the physical window.
     */
-    ~wxPanel();
+    virtual ~wxPanel();
 
     /**
         This method is overridden from wxWindow::AcceptsFocus()
@@ -86,7 +91,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxTAB_TRAVERSAL,
-                const wxString& name = "panel");
+                const wxString& name = wxPanelNameStr);
 
     /**
         Sends a wxInitDialogEvent, which in turn transfers data to the dialog via
@@ -94,10 +99,16 @@ public:
 
         @see wxInitDialogEvent
     */
-    void InitDialog();
+    virtual void InitDialog();
+
+    /**
+        See wxWindow::SetAutoLayout(): when auto layout is on, this function gets
+        called automatically when the window is resized.
+    */
+    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.
@@ -130,6 +141,6 @@ public:
         In contrast to SetFocus() (see above) this will set the focus to the panel
         even if there are child windows in the panel. This is only rarely needed.
     */
-    virtual void SetFocusIgnoringChildren();
+    void SetFocusIgnoringChildren();
 };