Removed unnecessary code from utilsunx.cpp

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

diff --git a/include/wx/mac/frame.h b/include/wx/mac/frame.h
index c01336217509ba2e0d85c1f84a71aa8084b19f82..c342d83c90c928c5e2db4d30277e5728acb871b7 100644 (file)
--- a/include/wx/mac/frame.h
+++ b/include/wx/mac/frame.h
@@ -19,12 +19,14 @@
 #include "wx/window.h"
 #include "wx/toolbar.h"
 #include "wx/accel.h"
 #include "wx/window.h"
 #include "wx/toolbar.h"
 #include "wx/accel.h"

+#include "wx/icon.h"

 
 WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
 WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
 
 WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
 WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;

+class WXDLLEXPORT wxMacToolTip ;

 
 class WXDLLEXPORT wxFrame: public wxWindow {
 
 
 class WXDLLEXPORT wxFrame: public wxWindow {
 


@@ -54,16 +56,7 @@ public:
            const wxString& name = wxFrameNameStr);
 
   virtual bool Destroy();
            const wxString& name = wxFrameNameStr);
 
   virtual bool Destroy();

-  void SetClientSize(int width, int height);
-  void GetClientSize(int *width, int *height) const;
-
-  void GetSize(int *width, int *height) const ;
-  void GetPosition(int *x, int *y) const ;
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  void ClientToScreen(int *x, int *y) const;
-  void ScreenToClient(int *x, int *y) const;
-
-  virtual bool OnClose();
+  virtual bool IsTopLevel() const { return TRUE; }

 
   void OnSize(wxSizeEvent& event);
   void OnMenuHighlight(wxMenuEvent& event);
 
   void OnSize(wxSizeEvent& event);
   void OnMenuHighlight(wxMenuEvent& event);


@@ -71,18 +64,10 @@ public:
   void OnIdle(wxIdleEvent& event);
   void OnCloseWindow(wxCloseEvent& event);
 
   void OnIdle(wxIdleEvent& event);
   void OnCloseWindow(wxCloseEvent& event);
 

-  bool Show(bool show);
-

   // Set menu bar
   void SetMenuBar(wxMenuBar *menu_bar);
   virtual wxMenuBar *GetMenuBar() const ;
 
   // Set menu bar
   void SetMenuBar(wxMenuBar *menu_bar);
   virtual wxMenuBar *GetMenuBar() const ;
 

-  // Set title
-  void SetTitle(const wxString& title);
-  wxString GetTitle() const ;
-
-  void Centre(int direction = wxBOTH);
-

   // Call this to simulate a menu command
   virtual void Command(int id);
   virtual void ProcessCommand(int id);
   // Call this to simulate a menu command
   virtual void Command(int id);
   virtual void ProcessCommand(int id);


@@ -98,6 +83,8 @@ public:
   virtual wxStatusBar *OnCreateStatusBar(int number, long style, wxWindowID id,
     const wxString& name);
 
   virtual wxStatusBar *OnCreateStatusBar(int number, long style, wxWindowID id,
     const wxString& name);
 

+#if wxUSE_TOOLBAR
+

   // Create toolbar
   virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1, const wxString& name = wxToolBarNameStr);
   virtual wxToolBar *OnCreateToolBar(long style, wxWindowID id, const wxString& name);
   // Create toolbar
   virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1, const wxString& name = wxToolBarNameStr);
   virtual wxToolBar *OnCreateToolBar(long style, wxWindowID id, const wxString& name);


@@ -106,6 +93,8 @@ public:
   virtual inline wxToolBar *GetToolBar() const { return m_frameToolBar; }
   virtual void PositionToolBar();
 
   virtual inline wxToolBar *GetToolBar() const { return m_frameToolBar; }
   virtual void PositionToolBar();
 

+#endif
+

   // Set status line text
   virtual void SetStatusText(const wxString& text, int number = 0);
 
   // Set status line text
   virtual void SetStatusText(const wxString& text, int number = 0);
 


@@ -137,11 +126,21 @@ 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 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 = tt; }
+    wxMacToolTip* m_hwndToolTip ;
+#endif // tooltips

 
 protected:
   wxMenuBar *           m_frameMenuBar;
 
 protected:
   wxMenuBar *           m_frameMenuBar;


@@ -149,7 +148,9 @@ protected:
   wxIcon                m_icon;
   bool                  m_iconized;
   static bool           m_useNativeStatusBar;
   wxIcon                m_icon;
   bool                  m_iconized;
   static bool           m_useNativeStatusBar;

+#if wxUSE_TOOLBAR

   wxToolBar *           m_frameToolBar ;
   wxToolBar *           m_frameToolBar ;

+#endif

 
   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };