use wxALIGN_LEFT/CENTRE/RIGHT instead of wxTE_XXX to avoid problems with the latter...

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

diff --git a/interface/wx/panel.h b/interface/wx/panel.h
index 6e6e8b3d683fdf7a44e7d1d3db7ca606da91ac20..934673f5cdf0226e6fc984055b162b5ca898aec8 100644 (file)
--- a/interface/wx/panel.h
+++ b/interface/wx/panel.h
@@ -8,7 +8,6 @@
 
 /**
     @class wxPanel
-    @wxheader{panel.h}
 
     A panel is a window on which controls are placed. It is usually placed within
     a frame. Its main feature over its parent class wxWindow is code for handling
@@ -27,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}
 
@@ -49,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.
@@ -65,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()
@@ -87,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
@@ -95,7 +99,13 @@ 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.
@@ -131,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();
 };