X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d062e17fca1a1fc0b82b269da4a7ad271075ba2b..2b84e565c6c26711e245bab5d4ce0fe1fe3e4078:/include/wx/mac/frame.h?ds=sidebyside

diff --git a/include/wx/mac/frame.h b/include/wx/mac/frame.h
index c71cf5fee5..39498bd06b 100644
--- a/include/wx/mac/frame.h
+++ b/include/wx/mac/frame.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.h
-// Purpose:     wxFrameMac class
+// Purpose:     wxFrame class
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
@@ -28,14 +28,12 @@ class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
 class WXDLLEXPORT wxMacToolTip ;
 
-class WXDLLEXPORT wxFrameMac: public wxFrameBase {
-
-  DECLARE_DYNAMIC_CLASS(wxFrameMac)
-
+class WXDLLEXPORT wxFrame: public wxFrameBase 
+{
 public:
     // construction
-    wxFrameMac() { Init(); }
-    wxFrameMac(wxWindow *parent,
+    wxFrame() { Init(); }
+    wxFrame(wxWindow *parent,
             wxWindowID id,
             const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
@@ -56,15 +54,7 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
-    virtual ~wxFrameMac();
-
-    // 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 SetIcon(const wxIcon& icon);
+    virtual ~wxFrame();
 
     // implementation only from now on
     // -------------------------------
@@ -120,7 +110,6 @@ protected:
     virtual void DoSetClientSize(int width, int height);
 
 protected:
-  bool                  m_iconized;
 #if wxUSE_STATUSBAR
     static bool           m_useNativeStatusBar;
 #endif // wxUSE_STATUSBAR
@@ -129,6 +118,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxFrame)
 };
 
 #endif