cleanup

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

diff --git a/include/wx/mac/carbon/frame.h b/include/wx/mac/carbon/frame.h
index b047c2bdf385c88fdfc788fea660d2784eb4392e..3119b143fec9454c42a3940a42258c207fb80c4f 100644 (file)
--- a/include/wx/mac/carbon/frame.h
+++ b/include/wx/mac/carbon/frame.h
@@ -82,13 +82,6 @@ public:
                                            const wxString& name = wxStatusLineNameStr);
 #endif // wxUSE_STATUSBAR
 
-    // tooltip management
-#if wxUSE_TOOLTIPS
-    wxMacToolTip* GetToolTipCtrl() const { return m_hwndToolTip; }
-    void SetToolTipCtrl(wxMacToolTip *tt) { m_hwndToolTip = tt; }
-    wxMacToolTip* m_hwndToolTip ;
-#endif // tooltips
-
     // called by wxWindow whenever it gets focus
     void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
     wxWindow *GetLastFocus() const { return m_winLastFocused; }

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index 64a2eea64bddc06013ada75f1b91df8c1b0c52c3..b630e653f4b7c94c8088c4cec87145f1b5f271b2 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -46,20 +46,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 
 void wxFrame::Init()
 {
-    m_frameMenuBar = NULL;
-    m_frameStatusBar = NULL;
     m_winLastFocused = NULL;
-
-#if wxUSE_TOOLBAR
-    m_frameToolBar = NULL;
-#endif
-
-#if wxUSE_TOOLTIPS
-    // NB: is this used anywhere?
-    m_hwndToolTip = NULL;
-#endif
-
-    m_iconized = false;
 }
 
 bool wxFrame::Create(wxWindow *parent,