Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some wxCollapsiblePane tweaks:

Browse Source 
- 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
This commit is contained in:
Robin Dunn
2006-11-11 07:32:08 +00:00
parent d2af7584c0
commit 037c7b4c7b
5 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/collpane.h
View File

@@ -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) #define wxCP_NO_TLW_RESIZE (0x0002)
class WXDLLIMPEXP_CORE wxCollapsiblePaneBase : public wxControl class WXDLLIMPEXP_CORE wxCollapsiblePaneBase : public wxControl

10
include/wx/generic/collpaneg.h
View File

@@ -19,7 +19,7 @@ class WXDLLEXPORT wxButton;
class WXDLLEXPORT wxStaticLine; class WXDLLEXPORT wxStaticLine;
// class name // 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 wxString& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, 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 wxString& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, 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

6
include/wx/gtk/collpane.h
View File

@@ -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 wxString& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, 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 = wxCollapsiblePaneNameStr) const wxString& name = wxCollapsiblePaneNameStr)
{ {
@@ -49,7 +47,7 @@ public:
const wxString& label, const wxString& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, 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 = wxCollapsiblePaneNameStr); const wxString& name = wxCollapsiblePaneNameStr);

6
src/generic/collpaneg.cpp
View File

@@ -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 #endif
// do not set sz as our sizers since we handle the pane window without using sizers // 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, m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxNO_BORDER); wxTAB_TRAVERSAL|wxNO_BORDER);
// start as collapsed: // start as collapsed:
m_pPane->Hide(); m_pPane->Hide();

6
src/gtk/collpane.cpp
View File

@@ -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; m_insertCallback = gtk_collapsiblepane_insert_callback;
// this the real "pane" // this the real "pane"
m_pPane = new wxWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxNO_BORDER); wxTAB_TRAVERSAL|wxNO_BORDER);
gtk_widget_show( GTK_WIDGET(m_widget) ); gtk_widget_show( GTK_WIDGET(m_widget) );
m_parent->DoAddChild( this ); m_parent->DoAddChild( this );