signned/unsigned fix

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

diff --git a/include/wx/mac/frame.h b/include/wx/mac/frame.h
index 331568d974e3f9a9e3b2f0ce12ceeabfc7ffd01c..95ddac84d1c2a0d6e323b03095e192d9ebfbcbc0 100644 (file)
--- a/include/wx/mac/frame.h
+++ b/include/wx/mac/frame.h
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR

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

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


@@ -28,10 +28,8 @@ class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
 class WXDLLEXPORT wxMacToolTip ;
 
 class WXDLLEXPORT wxStatusBar;
 class WXDLLEXPORT wxMacToolTip ;
 

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

 public:
     // construction
     wxFrame() { Init(); }
 public:
     // construction
     wxFrame() { Init(); }


@@ -58,20 +56,11 @@ public:
 
     virtual ~wxFrame();
 
 
     virtual ~wxFrame();
 

-    // implement base class pure virtuals
-    virtual void Maximize(bool maximize = TRUE);
-    virtual bool IsMaximized() const;
-    virtual void Iconize(bool iconize = TRUE);
-    virtual bool IsIconized() const;
-    virtual void Restore();
-    virtual void SetMenuBar(wxMenuBar *menubar);
-    virtual void SetIcon(const wxIcon& icon);
-

     // 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


@@ -112,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();


@@ -121,13 +114,15 @@ protected:
     virtual void DoSetClientSize(int width, int height);
 
 protected:
     virtual void DoSetClientSize(int width, int height);
 
 protected:

-  bool                  m_iconized;

 #if wxUSE_STATUSBAR
     static bool           m_useNativeStatusBar;
 #endif // wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR
     static bool           m_useNativeStatusBar;
 #endif // wxUSE_STATUSBAR

+    // the last focused child: we restore focus to it on activation
+    wxWindow             *m_winLastFocused;

 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxFrame)

 };
 
 #endif
 };
 
 #endif