Update to wxDataViewCtrl from Hartwig

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

diff --git a/include/wx/mac/frame.h b/include/wx/mac/frame.h
index 0f5acaa12bf74ab73ef0207a5ca97b463aa0f41d..fceb903d245e5aa98adec789c79b12d431c16388 100644 (file)
--- a/include/wx/mac/frame.h
+++ b/include/wx/mac/frame.h
@@ -1,127 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        frame.h
-// Purpose:     wxFrame class
-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FRAME_H_
-#define _WX_FRAME_H_
-
-#ifdef __GNUG__
-#pragma interface "frame.h"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/frame.h"
+#else
+#include "wx/mac/carbon/frame.h"

 #endif
 #endif

-
-#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;
-class WXDLLEXPORT wxMacToolTip ;
-
-class WXDLLEXPORT wxFrame: public wxFrameBase {
-
-  DECLARE_DYNAMIC_CLASS(wxFrame)
-
-public:
-    // construction
-    wxFrame() { Init(); }
-    wxFrame(wxWindow *parent,
-            wxWindowID id,
-            const wxString& title,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxDEFAULT_FRAME_STYLE,
-            const wxString& name = wxFrameNameStr)
-    {
-        Init();
-
-        Create(parent, id, title, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
-
-    virtual ~wxFrame();
-
-    // implementation only from now on
-    // -------------------------------
-
-    // override some more virtuals
-       virtual bool Enable(bool enable) ;
-
-    // get the origin of the client area (which may be different from (0, 0)
-    // if the frame has a toolbar) in client coordinates
-    virtual wxPoint GetClientAreaOrigin() const;
-
-    // event handlers
-    void OnActivate(wxActivateEvent& event);
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-
-    // Toolbar
-#if wxUSE_TOOLBAR
-    virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
-                                     wxWindowID id = -1,
-                                     const wxString& name = wxToolBarNameStr);
-
-    virtual void PositionToolBar();
-#endif // wxUSE_TOOLBAR
-
-    // Status bar
-#if wxUSE_STATUSBAR
-    virtual wxStatusBar* OnCreateStatusBar(int number = 1,
-                                           long style = wxST_SIZEGRIP,
-                                           wxWindowID id = 0,
-                                           const wxString& name = wxStatusLineNameStr);
-
-    virtual void PositionStatusBar();
-
-  // Hint to tell framework which status bar to use
-  // TODO: should this go into a wxFrameworkSettings class perhaps?
-  static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
-  static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };
-#endif // wxUSE_STATUSBAR
-
-    // tooltip management
-#if wxUSE_TOOLTIPS
-    wxMacToolTip* GetToolTipCtrl() const { return m_hwndToolTip; }
-    void SetToolTipCtrl(wxMacToolTip *tt) { m_hwndToolTip = tt; }
-    wxMacToolTip* m_hwndToolTip ;
-#endif // tooltips
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    // override base class virtuals
-    virtual void DoGetClientSize(int *width, int *height) const;
-    virtual void DoSetClientSize(int width, int height);
-
-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()
-    DECLARE_DYNAMIC_CLASS(wxFrame)
-};
-
-#endif
-    // _WX_FRAME_H_