X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..794bcc2dea743ac907b839f54e451847c9ea4b72:/include/wx/mac/frame.h

diff --git a/include/wx/mac/frame.h b/include/wx/mac/frame.h
index ae5e085877..c342d83c90 100644
--- a/include/wx/mac/frame.h
+++ b/include/wx/mac/frame.h
@@ -56,6 +56,7 @@ public:
            const wxString& name = wxFrameNameStr);
 
   virtual bool Destroy();
+  virtual bool IsTopLevel() const { return TRUE; }
 
   void OnSize(wxSizeEvent& event);
   void OnMenuHighlight(wxMenuEvent& event);
@@ -125,18 +126,20 @@ public:
   void OnSysColourChanged(wxSysColourChangedEvent& event);
 
   // Query app for menu item updates (called from OnIdle)
-  void DoMenuUpdates();
-  void DoMenuUpdates(wxMenu* menu);
+    // Query app for menu item updates (called from OnIdle)
+    void DoMenuUpdates();
+    void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
 
   // Checks if there is a toolbar, and returns the first free client position
   virtual wxPoint GetClientAreaOrigin() const;
-	virtual	void GetClientSize(int *x, int *y) const ;
+	virtual	void DoGetClientSize(int *x, int *y) const ;
 	virtual void DoSetClientSize(int clientwidth, int clientheight) ;
 
   // tooltip management
 #if wxUSE_TOOLTIPS
     wxMacToolTip* GetToolTipCtrl() const { return m_hwndToolTip; }
-    void SetToolTipCtrl(wxMacToolTip *tt) { m_hwndToolTip = wxMacToolTip; }
+    void SetToolTipCtrl(wxMacToolTip *tt) { m_hwndToolTip = tt; }
+    wxMacToolTip* m_hwndToolTip ;
 #endif // tooltips
 
 protected: