Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxMac: wxUniversal integration steps

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2001-07-04 20:11:26 +00:00
parent db73732184
commit e766c8a9ad
31 changed files with 774 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/mac/app.h
View File

@@ -22,7 +22,7 @@
#include "wx/event.h"
class WXDLLEXPORT wxFrame;
class WXDLLEXPORT wxWindow;
class WXDLLEXPORT wxWindowMac;
class WXDLLEXPORT wxApp ;
class WXDLLEXPORT wxKeyEvent;
class WXDLLEXPORT wxLog;
@@ -67,7 +67,7 @@ class WXDLLEXPORT wxApp: public wxAppBase
// Send idle event to window and all subwindows
// Returns TRUE if more idle time is requested.
bool SendIdleEvents(wxWindow* win);
bool SendIdleEvents(wxWindowMac* win);
// Windows only, but for compatibility...
inline void SetAuto3D(bool flag) { m_auto3D = flag; }

12
include/wx/mac/frame.h
View File

@@ -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);

4
include/wx/mac/setup.h
View File

@@ -183,7 +183,7 @@
// Recommended setting: 1 (always)
#define wxUSE_LOGWINDOW 1
#define wxUSE_LOG_DIALOG 0
// Recommended setting: 1 (always)
#define wxUSE_LOGGUI 1
@@ -701,7 +701,7 @@
// 0 for no interprocess comms
#define wxUSE_HELP 1
// 0 for no help facility
#define wxUSE_MS_HTML_HELP 0
#define wxUSE_WXHTML_HELP 1
// 0 for no MS HTML Help
#define wxUSE_RESOURCES 1
// 0 for no wxGetResource/wxWriteResource

58
include/wx/mac/window.h
View File

@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: window.h
// Purpose: wxWindow class
// Purpose: wxWindowMac class
// Author: AUTHOR
// Modified by:
// Created: ??/??/98
@@ -34,9 +34,9 @@ enum
wxKEY_CTRL = 2
};
class WXDLLEXPORT wxWindow: public wxWindowBase
class WXDLLEXPORT wxWindowMac: public wxWindowBase
{
DECLARE_DYNAMIC_CLASS(wxWindow);
DECLARE_DYNAMIC_CLASS(wxWindowMac);
friend class wxDC;
friend class wxPaintDC;
@@ -47,14 +47,14 @@ public:
SInt16 m_macWindowBackgroundTheme ;
WindowRef m_macWindow ;
ControlHandle m_macRootControl ;
wxWindow* m_macFocus ;
wxWindowMac* m_macFocus ;
bool m_macHasReceivedFirstActivate ;
} MacWindowData ;
wxWindow() { Init(); }
wxWindowMac() { Init(); }
wxWindow(wxWindow *parent,
wxWindowMac(wxWindowMac *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@@ -65,9 +65,9 @@ public:
Create(parent, id, pos, size, style, name);
}
virtual ~wxWindow();
virtual ~wxWindowMac();
bool Create(wxWindow *parent,
bool Create(wxWindowMac *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@@ -134,7 +134,7 @@ public:
// event handlers
// Handle a control command
virtual void OnCommand(wxWindow& win, wxCommandEvent& event);
virtual void OnCommand(wxWindowMac& win, wxCommandEvent& event);
// Override to define new behaviour for default action (e.g. double
// clicking on a listbox)
@@ -154,8 +154,8 @@ public:
// Native resource loading (implemented in src/msw/nativdlg.cpp)
// FIXME: should they really be all virtual?
wxWindow* GetWindowChild1(wxWindowID id);
wxWindow* GetWindowChild(wxWindowID id);
wxWindowMac* GetWindowChild1(wxWindowID id);
wxWindowMac* GetWindowChild(wxWindowID id);
// implementation from now on
// --------------------------
@@ -194,8 +194,8 @@ public:
// a toolbar that it manages itself).
virtual void AdjustForParentClientOrigin(int& x, int& y, int sizeFlags);
wxWindow *FindItem(long id) const;
wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = FALSE) const;
wxWindowMac *FindItem(long id) const;
wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = FALSE) const;
// Make a Windows extended style from the given wxWindows window style
static WXDWORD MakeExtendedStyle(long style,
@@ -228,7 +228,7 @@ public :
const wxSize& size,
long style,
const wxString& name ) ;
static bool MacGetWindowFromPoint( const wxPoint &point , wxWindow** outWin ) ;
static bool MacGetWindowFromPoint( const wxPoint &point , wxWindowMac** outWin ) ;
virtual void MacActivate( EventRecord *ev , bool inIsActivating ) ;
virtual void MacUpdate( EventRecord *ev ) ;
virtual void MacUpdateImmediately() ;
@@ -264,18 +264,18 @@ public :
bool MacSetupFocusClientPort() ;
bool MacSetupDrawingClientPort() ;
*/
virtual bool MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* rootwin ) ;
virtual bool MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* rootwin ) ;
virtual bool MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* rootwin ) ;
virtual bool MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* rootwin ) ;
virtual void MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) ;
virtual void MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin) ;
virtual void MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin) ;
virtual void MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) ;
virtual void MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin) ;
virtual void MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin) ;
MacWindowData* MacGetWindowData() { return m_macWindowData ; }
static WindowRef MacGetWindowInUpdate() { return s_macWindowInUpdate ; }
bool MacIsWindowScrollbar( const wxScrollBar* sb ) { return (m_hScrollBar == sb || m_vScrollBar == sb) ; }
static wxWindow* s_lastMouseWindow ;
static wxWindowMac* s_lastMouseWindow ;
private:
virtual bool MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWin ) ;
virtual bool MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) ;
protected:
MacWindowData* m_macWindowData ;
static WindowRef s_macWindowInUpdate ;
@@ -332,21 +332,21 @@ private:
// common part of all ctors
void Init();
DECLARE_NO_COPY_CLASS(wxWindow)
DECLARE_NO_COPY_CLASS(wxWindowMac)
DECLARE_EVENT_TABLE()
};
// associate mac windows with wx counterparts
wxWindow* wxFindWinFromMacWindow( WindowRef inWindow ) ;
void wxAssociateWinWithMacWindow(WindowRef inWindow, wxWindow *win) ;
void wxRemoveMacWindowAssociation(wxWindow *win) ;
wxWindowMac* wxFindWinFromMacWindow( WindowRef inWindow ) ;
void wxAssociateWinWithMacWindow(WindowRef inWindow, wxWindowMac *win) ;
void wxRemoveMacWindowAssociation(wxWindowMac *win) ;
/*
class wxMacFocusHelper
{
public :
wxMacFocusHelper( wxWindow * theWindow ) ;
wxMacFocusHelper( wxWindowMac * theWindow ) ;
~wxMacFocusHelper() ;
bool Ok() { return m_ok ; }
@@ -360,7 +360,7 @@ private :
class wxMacDrawingHelper
{
public :
wxMacDrawingHelper( wxWindow * theWindow ) ;
wxMacDrawingHelper( wxWindowMac * theWindow ) ;
~wxMacDrawingHelper() ;
bool Ok() { return m_ok ; }
@@ -374,7 +374,7 @@ private :
class wxMacFocusClientHelper
{
public :
wxMacFocusClientHelper( wxWindow * theWindow ) ;
wxMacFocusClientHelper( wxWindowMac * theWindow ) ;
~wxMacFocusClientHelper() ;
bool Ok() { return m_ok ; }
@@ -387,7 +387,7 @@ private :
class wxMacDrawingClientHelper
{
public :
wxMacDrawingClientHelper( wxWindow * theWindow ) ;
wxMacDrawingClientHelper( wxWindowMac * theWindow ) ;
~wxMacDrawingClientHelper() ;
bool Ok() { return m_ok ; }