Some wxCollapsiblePane tweaks:

 - Use wxCP_DEFAULT_STYLE
 - Share a single wxCollapsiblePaneNameStr for the native and generic
   versions
 - Use a wxPanel for the pane so tab traversal works in the pane

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/collpane.h b/include/wx/collpane.h
index ba26a422bb2f071d7aa83457664ec6cdd5e6de37..8ff545d3bcda9be57ee2dc287c3f461ea7f2782c 100644 (file)
--- a/include/wx/collpane.h
+++ b/include/wx/collpane.h
@@ -24,7 +24,7 @@
 // wxCollapsiblePaneBase: interface for wxCollapsiblePane
 // ----------------------------------------------------------------------------
 
 // wxCollapsiblePaneBase: interface for wxCollapsiblePane
 // ----------------------------------------------------------------------------
 

-#define wxCP_DEFAULT_STYLE          (wxNO_BORDER)
+#define wxCP_DEFAULT_STYLE          (wxTAB_TRAVERSAL | wxNO_BORDER)

 #define wxCP_NO_TLW_RESIZE          (0x0002)
 
 class WXDLLIMPEXP_CORE wxCollapsiblePaneBase : public wxControl
 #define wxCP_NO_TLW_RESIZE          (0x0002)
 
 class WXDLLIMPEXP_CORE wxCollapsiblePaneBase : public wxControl

diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index daaea636fefdd304a6956afebc896cec602ddb55..e8fd85a06ee53ab58069a49c9b7791bf402efebb 100644 (file)
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -19,7 +19,7 @@ class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxStaticLine;
 
 // class name
 class WXDLLEXPORT wxStaticLine;
 
 // class name

-extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxGenericCollapsiblePaneNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[];

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------


@@ -36,9 +36,9 @@ public:
                         const wxString& label,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         const wxString& label,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,

-                        long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+                        long style = wxCP_DEFAULT_STYLE,

                         const wxValidator& val = wxDefaultValidator,
                         const wxValidator& val = wxDefaultValidator,

-                        const wxString& name = wxGenericCollapsiblePaneNameStr)
+                        const wxString& name = wxCollapsiblePaneNameStr)

     {
         Init();
 
     {
         Init();
 


@@ -60,9 +60,9 @@ public:
                 const wxString& label,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& label,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+                long style = wxCP_DEFAULT_STYLE,

                 const wxValidator& val = wxDefaultValidator,
                 const wxValidator& val = wxDefaultValidator,

-                const wxString& name = wxGenericCollapsiblePaneNameStr);
+                const wxString& name = wxCollapsiblePaneNameStr);

 
 
     // public wxCollapsiblePane API
 
 
     // public wxCollapsiblePane API

diff --git a/include/wx/gtk/collpane.h b/include/wx/gtk/collpane.h
index 72ece131edc5a222ab93a12bb91922eebd3418c6..76dc4bd2f44b37a0a937e0bb771342e548ba1da3 100644 (file)
--- a/include/wx/gtk/collpane.h
+++ b/include/wx/gtk/collpane.h
@@ -14,8 +14,6 @@
 
 #include "wx/generic/collpaneg.h"
 
 
 #include "wx/generic/collpaneg.h"
 

-extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[];
-

 // ----------------------------------------------------------------------------
 // wxCollapsiblePane
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxCollapsiblePane
 // ----------------------------------------------------------------------------


@@ -30,7 +28,7 @@ public:
                         const wxString& label,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         const wxString& label,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,

-                        long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+                        long style = wxCP_DEFAULT_STYLE,

                         const wxValidator& val = wxDefaultValidator,
                         const wxString& name = wxCollapsiblePaneNameStr)
     {
                         const wxValidator& val = wxDefaultValidator,
                         const wxString& name = wxCollapsiblePaneNameStr)
     {


@@ -49,7 +47,7 @@ public:
                 const wxString& label,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& label,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+                long style = wxCP_DEFAULT_STYLE,

                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxCollapsiblePaneNameStr);
 
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxCollapsiblePaneNameStr);
 

diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp
index 1e2a14880faf4c2b8902bd9c6618c1b18e88dde4..27f0cad8ba1f7ef8c7b57dd0456e7dd3fd2fb326 100644 (file)
--- a/src/generic/collpaneg.cpp
+++ b/src/generic/collpaneg.cpp
@@ -38,7 +38,7 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-const wxChar wxGenericCollapsiblePaneNameStr[] = wxT("genericCollapsiblePane");
+const wxChar wxCollapsiblePaneNameStr[] = wxT("collapsiblePane");

 
 //-----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 
 //-----------------------------------------------------------------------------
 // wxGenericCollapsiblePane


@@ -90,8 +90,8 @@ bool wxGenericCollapsiblePane::Create(wxWindow *parent,
 #endif
 
     // do not set sz as our sizers since we handle the pane window without using sizers
 #endif
 
     // do not set sz as our sizers since we handle the pane window without using sizers

-    m_pPane = new wxWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-                           wxNO_BORDER);
+    m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+                          wxTAB_TRAVERSAL|wxNO_BORDER);

 
     // start as collapsed:
     m_pPane->Hide();
 
     // start as collapsed:
     m_pPane->Hide();

diff --git a/src/gtk/collpane.cpp b/src/gtk/collpane.cpp
index 229a4759b100ab4a3e01d5d7445eb0d1da4397de..bf6962fe7a6a8a35ddc07b5626bde1423981d741 100644 (file)
--- a/src/gtk/collpane.cpp
+++ b/src/gtk/collpane.cpp
@@ -28,8 +28,6 @@
 
 #include <gtk/gtkexpander.h>
 
 
 #include <gtk/gtkexpander.h>
 

-const wxChar wxCollapsiblePaneNameStr[] = wxT("CollapsiblePane");
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -224,8 +222,8 @@ bool wxCollapsiblePane::Create(wxWindow *parent,
     m_insertCallback = gtk_collapsiblepane_insert_callback;
 
     // this the real "pane"
     m_insertCallback = gtk_collapsiblepane_insert_callback;
 
     // this the real "pane"

-    m_pPane = new wxWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-                           wxNO_BORDER);
+    m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+                           wxTAB_TRAVERSAL|wxNO_BORDER);

 
     gtk_widget_show( GTK_WIDGET(m_widget) );
     m_parent->DoAddChild( this );
 
     gtk_widget_show( GTK_WIDGET(m_widget) );
     m_parent->DoAddChild( this );