Fixed missing paint events when overriding DoMoveWindow()

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

diff --git a/include/wx/mac/frame.h b/include/wx/mac/frame.h
index ae5e085877ab879194629b07b61d97c52c261ca1..c342d83c90c928c5e2db4d30277e5728acb871b7 100644 (file)
--- a/include/wx/mac/frame.h
+++ b/include/wx/mac/frame.h
@@ -56,6 +56,7 @@ public:
            const wxString& name = wxFrameNameStr);
 
   virtual bool Destroy();
            const wxString& name = wxFrameNameStr);
 
   virtual bool Destroy();

+  virtual bool IsTopLevel() const { return TRUE; }

 
   void OnSize(wxSizeEvent& event);
   void OnMenuHighlight(wxMenuEvent& event);
 
   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 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;
 
   // 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; }
        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:
 #endif // tooltips
 
 protected: