Toolbar/tooltip udates

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

diff --git a/include/wx/mac/frame.h b/include/wx/mac/frame.h
index c3032d69f04bcf556797043fc6bccd90031c23eb..95ddac84d1c2a0d6e323b03095e192d9ebfbcbc0 100644 (file)
--- a/include/wx/mac/frame.h
+++ b/include/wx/mac/frame.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.h

-// Purpose:     wxFrameMac class
+// Purpose:     wxFrame class

 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_


@@ -28,14 +28,12 @@ class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
 class WXDLLEXPORT wxMacToolTip ;
 
 class WXDLLEXPORT wxStatusBar;
 class WXDLLEXPORT wxMacToolTip ;
 

-class WXDLLEXPORT wxFrameMac: public wxFrameBase {
-
-  DECLARE_DYNAMIC_CLASS(wxFrameMac)
-
+class WXDLLEXPORT wxFrame: public wxFrameBase 
+{

 public:
     // construction
 public:
     // construction

-    wxFrameMac() { Init(); }
-    wxFrameMac(wxWindow *parent,
+    wxFrame() { Init(); }
+    wxFrame(wxWindow *parent,

             wxWindowID id,
             const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
             wxWindowID id,
             const wxString& title,
             const wxPoint& pos = wxDefaultPosition,


@@ -56,13 +54,13 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 

-    virtual ~wxFrameMac();
+    virtual ~wxFrame();

 
     // implementation only from now on
     // -------------------------------
 
     // override some more virtuals
 
     // implementation only from now on
     // -------------------------------
 
     // override some more virtuals

-       virtual bool Enable(bool enable) ;
+    virtual bool Enable(bool enable = TRUE) ;

 
     // get the origin of the client area (which may be different from (0, 0)
     // if the frame has a toolbar) in client coordinates
 
     // get the origin of the client area (which may be different from (0, 0)
     // if the frame has a toolbar) in client coordinates


@@ -103,6 +101,10 @@ public:
     wxMacToolTip* m_hwndToolTip ;
 #endif // tooltips
 
     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; }
+

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();


@@ -120,6 +122,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxFrame)

 };
 
 #endif
 };
 
 #endif