wxHtmlEasyPrinting indentation changes + CreatePrintout,DoPrint and DoPreview virtual...

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

diff --git a/include/wx/mac/frame.h b/include/wx/mac/frame.h
index 331568d974e3f9a9e3b2f0ce12ceeabfc7ffd01c..c71cf5fee5b6fdac331879177fd2a365ac89f638 100644 (file)
--- a/include/wx/mac/frame.h
+++ b/include/wx/mac/frame.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.h
-// Purpose:     wxFrame class
+// Purpose:     wxFrameMac class
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
@@ -28,14 +28,14 @@ class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
 class WXDLLEXPORT wxMacToolTip ;
 
-class WXDLLEXPORT wxFrame: public wxFrameBase {
+class WXDLLEXPORT wxFrameMac: public wxFrameBase {
 
-  DECLARE_DYNAMIC_CLASS(wxFrame)
+  DECLARE_DYNAMIC_CLASS(wxFrameMac)
 
 public:
     // construction
-    wxFrame() { Init(); }
-    wxFrame(wxWindow *parent,
+    wxFrameMac() { Init(); }
+    wxFrameMac(wxWindow *parent,
             wxWindowID id,
             const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
@@ -56,7 +56,7 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
-    virtual ~wxFrame();
+    virtual ~wxFrameMac();
 
     // implement base class pure virtuals
     virtual void Maximize(bool maximize = TRUE);
@@ -64,7 +64,6 @@ public:
     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
@@ -125,6 +124,8 @@ protected:
 #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()