X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/86adc75813eedc3eabf746e30c8a571d528439a3..3c81c9aafbe0018b9d44005767040ec3ebe65349:/include/wx/cocoa/toplevel.h diff --git a/include/wx/cocoa/toplevel.h b/include/wx/cocoa/toplevel.h index 7cc666b111..5ac33f1a77 100644 --- a/include/wx/cocoa/toplevel.h +++ b/include/wx/cocoa/toplevel.h @@ -28,7 +28,9 @@ class WXDLLEXPORT wxTopLevelWindowCocoa : public wxTopLevelWindowBase, protected // initialization // ------------------------------------------------------------------------ public: - inline wxTopLevelWindowCocoa() { Init(); } + inline wxTopLevelWindowCocoa() + : wxCocoaNSWindow(this) + { Init(); } inline wxTopLevelWindowCocoa(wxWindow *parent, wxWindowID winid, @@ -37,6 +39,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr) + : wxCocoaNSWindow(this) { Init(); Create(parent, winid, title, pos, size, style, name); @@ -67,8 +70,8 @@ public: virtual void CocoaDelegate_windowDidResignKey(void); virtual void CocoaDelegate_windowDidBecomeMain(void); virtual void CocoaDelegate_windowDidResignMain(void); - virtual void CocoaDelegate_wxMenuItemAction(struct objc_object *sender); - virtual bool CocoaDelegate_validateMenuItem(struct objc_object *sender); + virtual void CocoaDelegate_wxMenuItemAction(WX_NSMenuItem sender); + virtual bool CocoaDelegate_validateMenuItem(WX_NSMenuItem sender); virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win); static void DeactivatePendingWindow(); protected: @@ -100,6 +103,8 @@ public: virtual void DoMoveWindow(int x, int y, int width, int height); virtual void DoGetSize(int *width, int *height) const; virtual void DoGetPosition(int *x, int *y) const; + virtual void SetTitle( const wxString& title); + virtual wxString GetTitle() const; // Things I may/may not do @@ -108,7 +113,6 @@ public: // virtual void Clear() ; // virtual void Raise(); // virtual void Lower(); -// virtual void SetTitle( const wxString& title); protected: // is the frame currently iconized? bool m_iconized;