use wxString, not wxChar*, in wxDataFormat ctor and SetId() method

[wxWidgets.git] / include / wx / mac / carbon / frame.h

diff --git a/include/wx/mac/carbon/frame.h b/include/wx/mac/carbon/frame.h
index 306c9ff2ecf65f985010096a7584b51e54abe0ce..3119b143fec9454c42a3940a42258c207fb80c4f 100644 (file)
--- a/include/wx/mac/carbon/frame.h
+++ b/include/wx/mac/carbon/frame.h
@@ -17,7 +17,6 @@
 #include "wx/accel.h"
 #include "wx/icon.h"
 
-WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[];
 WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
 
 class WXDLLEXPORT wxMenuBar;
@@ -83,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; }