testing header replace

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

diff --git a/interface/wx/panel.h b/interface/wx/panel.h
index 6e6e8b3d683fdf7a44e7d1d3db7ca606da91ac20..f836f6c6a1f35557f7c1fa843504ee3c72c88d30 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
@@ -65,12 +64,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 +86,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 +94,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 +136,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();
 };