changed wxControlContainer to avoid triggering tons of warnings from VC++ at

warning level 4 ("'this' : used in base member initializer list" is really
the stupidiest warning I've ever seen)

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

diff --git a/include/wx/containr.h b/include/wx/containr.h
index 3e84da9384f1298e39b02b0ed9da4dd76a30bce4..7139ef424272c900d4cc4498f387c6a32adb9ae7 100644 (file)
--- a/include/wx/containr.h
+++ b/include/wx/containr.h
@@ -39,14 +39,14 @@ class WXDLLEXPORT wxControlContainer
 {
 public:
     // ctors and such
 {
 public:
     // ctors and such

-    wxControlContainer(wxWindow *winParent);
+    wxControlContainer(wxWindow *winParent = NULL);
+    void SetContainerWindow(wxWindow *winParent) { m_winParent = winParent; }

 
 

+    // default item access

     wxWindow *GetDefaultItem() const { return m_winDefault; }
     wxWindow *SetDefaultItem(wxWindow *win)
         { wxWindow *winOld = m_winDefault; m_winDefault = win; return winOld; }
 
     wxWindow *GetDefaultItem() const { return m_winDefault; }
     wxWindow *SetDefaultItem(wxWindow *win)
         { wxWindow *winOld = m_winDefault; m_winDefault = win; return winOld; }
 

-    void SetLastFocus(wxWindow *win);
-

     // the methods to be called from the window event handlers
     void HandleOnNavigationKey(wxNavigationKeyEvent& event);
     void HandleOnFocus(wxFocusEvent& event);
     // the methods to be called from the window event handlers
     void HandleOnNavigationKey(wxNavigationKeyEvent& event);
     void HandleOnFocus(wxFocusEvent& event);


@@ -56,6 +56,10 @@ public:
     // the focus and the default processing should take place
     bool DoSetFocus();
 
     // the focus and the default processing should take place
     bool DoSetFocus();
 

+    // called from OnChildFocus() handler, i.e. when one of our (grand)
+    // children gets the focus
+    void SetLastFocus(wxWindow *win);
+

 protected:
     // set the focus to the child which had it the last time
     bool SetFocusToChild();
 protected:
     // set the focus to the child which had it the last time
     bool SetFocusToChild();

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index 85f91ee81a39e7bbb0c581ac8e63ca3da5cf0fb9..cf5685d9489df58d667b09422f7ee2ed471c60e4 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -34,7 +34,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 class WXDLLEXPORT wxPanel : public wxWindow
 {
 public:
 class WXDLLEXPORT wxPanel : public wxWindow
 {
 public:

-    wxPanel() : m_container(this) { Init(); }
+    wxPanel() { Init(); }

 
     // Old-style constructor (no default values for coordinates to avoid
     // ambiguity with the new one)
 
     // Old-style constructor (no default values for coordinates to avoid
     // ambiguity with the new one)


@@ -42,7 +42,6 @@ public:
             int x, int y, int width, int height,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
             int x, int y, int width, int height,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)

-        : m_container(this)

     {
         Init();
 
     {
         Init();
 


@@ -56,7 +55,6 @@ public:
             const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
             const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)

-        : m_container(this)

     {
         Init();
 
     {
         Init();
 

diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index 640d2bea57e84365ea6c780f5fca02a0bd6b9554..8528e2265bcb0ed052509e5aea944551125bbab3 100644 (file)
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -61,7 +61,7 @@ public:
 // Public API
 
     // Default constructor
 // Public API
 
     // Default constructor

-    wxSplitterWindow() : m_container(this)
+    wxSplitterWindow()

     {
         Init();
     }
     {
         Init();
     }


@@ -72,7 +72,6 @@ public:
                      const wxSize& size = wxDefaultSize,
                      long style = wxSP_3D,
                      const wxString& name = "splitter")
                      const wxSize& size = wxDefaultSize,
                      long style = wxSP_3D,
                      const wxString& name = "splitter")

-        : m_container(this)

     {
         Init();
         Create(parent, id, pos, size, style, name);
     {
         Init();
         Create(parent, id, pos, size, style, name);

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index c36c49c46d2bb3397d4eb1ef64a85582b3c63488..aa5e3ec4264920ca81122def6c939efcb98920b6 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -65,6 +65,7 @@ WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel)
 
 void wxPanel::Init()
 {
 
 void wxPanel::Init()
 {

+    m_container.SetContainerWindow(this);

 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 7b0a84b401e66e64c102641e49b16658dbe5af10..dc50eb3590c1893f55157e472b0b811deba95712 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -93,6 +93,8 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,
 
 void wxSplitterWindow::Init()
 {
 
 void wxSplitterWindow::Init()
 {

+    m_container.SetContainerWindow(this);
+

     m_splitMode = wxSPLIT_VERTICAL;
     m_permitUnsplitAlways = TRUE;
     m_windowOne = (wxWindow *) NULL;
     m_splitMode = wxSPLIT_VERTICAL;
     m_permitUnsplitAlways = TRUE;
     m_windowOne = (wxWindow *) NULL;