X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b18f47d00225c28c8f4152a2b7a1a14bcbe1c7ef..36a0190ebd5bd9a7302f60f6dcd608b80574e21c:/interface/wx/collpane.h

diff --git a/interface/wx/collpane.h b/interface/wx/collpane.h
index bc553de157..714df38795 100644
--- a/interface/wx/collpane.h
+++ b/interface/wx/collpane.h
@@ -2,10 +2,12 @@
 // Name:        collpane.h
 // Purpose:     interface of wxCollapsiblePane
 // Author:      wxWidgets team
-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#define wxCP_DEFAULT_STYLE          (wxTAB_TRAVERSAL | wxNO_BORDER)
+#define wxCP_NO_TLW_RESIZE          (0x0002)
+
 /**
     @class wxCollapsiblePaneEvent
 
@@ -41,7 +43,7 @@ public:
     void SetCollapsed(bool collapsed);
 };
 
-
+wxEventType wxEVT_COLLAPSIBLEPANE_CHANGED;
 
 /**
     @class wxCollapsiblePane
@@ -65,7 +67,7 @@ public:
     Usage sample:
 
     @code
-    wxCollapsiblePane *collpane = new wxCollapsiblePane(this, wxID_ANY, wxT("Details:"));
+    wxCollapsiblePane *collpane = new wxCollapsiblePane(this, wxID_ANY, "Details:");
 
     // add the pane with a zero proportion value to the 'sz' sizer which contains it
     sz->Add(collpane, 0, wxGROW|wxALL, 5);
@@ -73,7 +75,7 @@ public:
     // now add a test label in the collapsible pane using a sizer to layout it:
     wxWindow *win = collpane->GetPane();
     wxSizer *paneSz = new wxBoxSizer(wxVERTICAL);
-    paneSz->Add(new wxStaticText(win, wxID_ANY, wxT("test!")), 1, wxGROW|wxALL, 2);
+    paneSz->Add(new wxStaticText(win, wxID_ANY, "test!"), 1, wxGROW|wxALL, 2);
     win->SetSizer(paneSz);
     paneSz->SetSizeHints(win);
     @endcode
@@ -91,14 +93,16 @@ public:
         flag to disable this automatic parent resizing then.
     @endStyleTable
 
-    @beginEventTable{wxCollapsiblePaneEvent}
+    @beginEventEmissionTable{wxCollapsiblePaneEvent,wxNavigationKeyEvent}
     @event{EVT_COLLAPSIBLEPANE_CHANGED(id, func)}
-           The user expanded or collapsed the collapsible pane.
+        The user expanded or collapsed the collapsible pane.
+    @event{EVT_NAVIGATION_KEY(func)}
+        Process a navigation key event.
     @endEventTable
 
     @library{wxcore}
     @category{ctrl}
-    <!-- @appearance{collapsiblepane.png} -->
+    @appearance{collapsiblepane}
 
     @see wxPanel, wxCollapsiblePaneEvent
 */
@@ -109,7 +113,7 @@ public:
         Default constructor.
     */
     wxCollapsiblePane();
-    
+
     /**
         Initializes the object and calls Create() with all the parameters.
     */
@@ -119,7 +123,7 @@ public:
                       const wxSize& size = wxDefaultSize,
                       long style = wxCP_DEFAULT_STYLE,
                       const wxValidator& validator = wxDefaultValidator,
-                      const wxString& name = "collapsiblePane");
+                      const wxString& name = wxCollapsiblePaneNameStr);
 
     /**
         @param parent
@@ -149,12 +153,12 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxCP_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = "collapsiblePane");
+                const wxString& name = wxCollapsiblePaneNameStr);
 
     /**
         Collapses or expands the pane window.
     */
-    void Collapse(bool collapse = true);
+    virtual void Collapse(bool collapse = true);
 
     /**
         Same as calling Collapse(@false).
@@ -165,16 +169,15 @@ public:
         Returns a pointer to the pane window. Add controls to the returned
         wxWindow to make them collapsible.
     */
-    wxWindow* GetPane() const;
+    virtual wxWindow* GetPane() const;
 
     /**
         Returns @true if the pane window is currently hidden.
     */
-    bool IsCollapsed() const;
+    virtual bool IsCollapsed() const;
 
     /**
         Returns @true if the pane window is currently shown.
     */
     bool IsExpanded() const;
 };
-