From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 4 Jul 2001 20:11:26 +0000 (+0000)
Subject: wxMac: wxUniversal integration steps
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e766c8a9ad51ecf73e8f1641992f1007ee9e5e0a
wxMac: wxUniversal integration steps
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
diff --git a/include/wx/frame.h b/include/wx/frame.h
index 7277261c83..fd9afe2a91 100644
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -294,6 +294,28 @@ protected:
#include "wx/qt/frame.h"
#elif defined(__WXMAC__)
#include "wx/mac/frame.h"
+ #ifndef __WXUNIVERSAL__
+
+ class WXDLLEXPORT wxFrame : public wxFrameMac
+ {
+ 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);
+ }
+ DECLARE_DYNAMIC_CLASS(wxFrame)
+ };
+
+ #endif
#elif defined(__WXPM__)
#include "wx/os2/frame.h"
#elif defined(__WXSTUBS__)
diff --git a/include/wx/mac/app.h b/include/wx/mac/app.h
index e28f626e38..9856301aa6 100644
--- a/include/wx/mac/app.h
+++ b/include/wx/mac/app.h
@@ -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; }
diff --git a/include/wx/mac/frame.h b/include/wx/mac/frame.h
index ec02faec6d..4a691898ab 100644
--- 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);
diff --git a/include/wx/mac/setup.h b/include/wx/mac/setup.h
index 6f4aa5a582..3cc43b9926 100644
--- a/include/wx/mac/setup.h
+++ b/include/wx/mac/setup.h
@@ -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
diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h
index 76be482a00..9c449c2413 100644
--- a/include/wx/mac/window.h
+++ b/include/wx/mac/window.h
@@ -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 ; }
diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h
index 608296c560..693d7e2377 100644
--- a/include/wx/univ/frame.h
+++ b/include/wx/univ/frame.h
@@ -26,6 +26,8 @@
#define wxFrameNative wxFrameGTK
#elif defined(__WXMGL__)
#define wxFrameNative wxFrameMGL
+#elif defined(__WXMAC__)
+#define wxFrameNative wxFrameMac
#endif
class wxFrame : public wxFrameNative
diff --git a/include/wx/univ/menu.h b/include/wx/univ/menu.h
index 1dbc2b3345..c8f14231eb 100644
--- a/include/wx/univ/menu.h
+++ b/include/wx/univ/menu.h
@@ -142,8 +142,11 @@ private:
#endif // wxUSE_ACCEL
// it calls out OnDismiss()
+#ifdef __WXMAC__
+ friend class wxPopupMenuWindow;
+#else
friend wxPopupMenuWindow;
-
+#endif
DECLARE_DYNAMIC_CLASS(wxMenu)
};
@@ -275,7 +278,11 @@ private:
bool m_shouldShowMenu;
// it calls out ProcessMouseEvent()
+#ifdef __WXMAC__
+ friend class wxPopupMenuWindow;
+#else
friend wxPopupMenuWindow;
+#endif
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxMenuBar)
diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h
index 6c36613b16..3304d277ea 100644
--- a/include/wx/univ/renderer.h
+++ b/include/wx/univ/renderer.h
@@ -220,6 +220,7 @@ public:
int step = 1,
int flags = 0) = 0;
+#if wxUSE_MENUS
// draw a menu bar item
virtual void DrawMenuBarItem(wxDC& dc,
const wxRect& rect,
@@ -243,7 +244,7 @@ public:
virtual void DrawMenuSeparator(wxDC& dc,
wxCoord y,
const wxMenuGeometryInfo& geomInfo) = 0;
-
+#endif
// misc functions
// --------------
@@ -334,6 +335,7 @@ public:
// get the size of one progress bar step (in horz and vertical directions)
virtual wxSize GetProgressBarStep() const = 0;
+#if wxUSE_MENUS
// get the size of rectangle to use in the menubar for the given text rect
virtual wxSize GetMenuBarItemSize(const wxSize& sizeText) const = 0;
@@ -344,7 +346,7 @@ public:
// the returned pointer must be deleted by the caller
virtual wxMenuGeometryInfo *GetMenuGeometry(wxWindow *win,
const wxMenu& menu) const = 0;
-
+#endif
// virtual dtor for any base class
virtual ~wxRenderer();
@@ -546,6 +548,7 @@ public:
int flags = 0)
{ m_renderer->DrawSliderTicks(dc, rect, sizeThumb, orient,
start, end, start, flags); }
+#if wxUSE_MENUS
virtual void DrawMenuBarItem(wxDC& dc,
const wxRect& rect,
@@ -567,7 +570,7 @@ public:
wxCoord y,
const wxMenuGeometryInfo& geomInfo)
{ m_renderer->DrawMenuSeparator(dc, y, geomInfo); }
-
+#endif
virtual void GetComboBitmaps(wxBitmap *bmpNormal,
wxBitmap *bmpPressed,
wxBitmap *bmpDisabled)
@@ -628,12 +631,13 @@ public:
{ return m_renderer->GetSliderThumbSize(rect, orient); }
virtual wxSize GetProgressBarStep() const
{ return m_renderer->GetProgressBarStep(); }
+#if wxUSE_MENUS
virtual wxSize GetMenuBarItemSize(const wxSize& sizeText) const
{ return m_renderer->GetMenuBarItemSize(sizeText); }
virtual wxMenuGeometryInfo *GetMenuGeometry(wxWindow *win,
const wxMenu& menu) const
{ return m_renderer->GetMenuGeometry(win, menu); }
-
+#endif
protected:
wxRenderer *m_renderer;
};
diff --git a/include/wx/univ/setup.h b/include/wx/univ/setup.h
index b5ef87546f..24f7b684c7 100644
--- a/include/wx/univ/setup.h
+++ b/include/wx/univ/setup.h
@@ -15,6 +15,161 @@
// ----------------------------------------------------------------------------
// undef everything
// ----------------------------------------------------------------------------
+#ifdef __WXMAC__
+
+#define wxUSE_GUI 1
+#define WXWIN_COMPATIBILITY 0
+#define wxICON_IS_BITMAP 0
+#define wxFONT_SIZE_COMPATIBILITY 0
+#define wxDIALOG_UNIT_COMPATIBILITY 0
+#define wxUSE_DEBUG_CONTEXT 0
+#define wxUSE_MEMORY_TRACING 0
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
+#define wxUSE_DEBUG_NEW_ALWAYS 0
+#define wxUSE_ON_FATAL_EXCEPTION 0
+
+#define wxUSE_UNICODE 0
+#define wxUSE_WCHAR_T 0
+#define wxUSE_LOG 1
+#define wxUSE_LOGGUI 1
+#define wxUSE_LOGWINDOW 1
+#define wxUSE_LOG_DIALOG 0
+#define wxUSE_THREADS 0
+#define wxUSE_STREAMS 0
+#define wxUSE_STD_IOSTREAM 0
+#define wxUSE_SERIAL 0
+#define wxUSE_LONGLONG 1
+#define wxUSE_TIMER 1
+#define wxUSE_STOPWATCH 1
+#define wxUSE_TIMEDATE 0
+#define wxUSE_DATETIME 1
+#define wxUSE_CONFIG 0
+#define wxUSE_CONFIG_NATIVE 0
+#define wxUSE_DIALUP_MANAGER 0
+#define wxUSE_DYNLIB_CLASS 0
+#define wxUSE_SOCKETS 0
+#define wxUSE_FILESYSTEM 0
+#define wxUSE_FS_ZIP 0
+#define wxUSE_FS_INET 0
+#define wxUSE_ZIPSTREAM 0
+#define wxUSE_ZLIB 0
+#define wxUSE_FILESYSTEM 0
+#define wxUSE_FS_ZIP 0
+#define wxUSE_FS_INET 0
+#define wxUSE_ZIPSTREAM 0
+#define wxUSE_ZLIB 0
+#define wxUSE_APPLE_IEEE 0
+#define wxUSE_FILE 1
+#define wxUSE_FFILE 1
+#define wxUSE_TEXTFILE 0
+#define wxUSE_INTL 0
+#define wxUSE_MENUS 0 // was 1
+#define wxUSE_TOOLBAR 0
+#define wxUSE_TOOLBAR_NATIVE 0
+#define wxUSE_TOOLBAR_SIMPLE 0
+#define wxUSE_NOTEBOOK 1
+#define wxUSE_FONTMAP 0
+#define wxUSE_MIMETYPE 0
+#define wxUSE_IMAGE 1
+
+#define wxUSE_CONTROLS 1
+#define wxUSE_POPUPWIN 1
+#define wxUSE_BUTTON 1
+#define wxUSE_BMPBUTTON 1
+#define wxUSE_CALENDARCTRL 0
+#define wxUSE_CARET 1
+#define wxUSE_CHECKBOX 1
+#define wxUSE_CHECKLISTBOX 1
+#define wxUSE_CHOICE 0
+#define wxUSE_COMBOBOX 0 // was 1
+#define wxUSE_GAUGE 1
+#define wxUSE_IMAGLIST 1
+#define wxUSE_LISTBOX 1
+#define wxUSE_LISTCTRL 0
+#define wxUSE_RADIOBOX 1
+#define wxUSE_RADIOBTN 1
+#define wxUSE_SASH 0
+#define wxUSE_SCROLLBAR 1
+#define wxUSE_SLIDER 1
+#define wxUSE_SPINBTN 1
+#define wxUSE_SPINCTRL 1
+#define wxUSE_STATBOX 1
+#define wxUSE_STATLINE 1
+#define wxUSE_STATTEXT 1
+#define wxUSE_STATBMP 1
+#define wxUSE_STATUSBAR 0
+#define wxUSE_TEXTCTRL 1
+#define wxUSE_TOOLTIPS 0
+#define wxUSE_TREECTRL 0
+
+#define wxUSE_NATIVE_STATUSBAR 0
+#define wxUSE_BUTTONBAR 0
+#define wxUSE_GRID 0
+#define wxUSE_NEW_GRID 0
+#define wxUSE_VALIDATORS 0
+#define wxUSE_ACCEL 1
+#define wxUSE_GENERIC_DIALOGS_IN_MSW 0
+#define wxUSE_COMMON_DIALOGS 0
+#define wxUSE_TEXTDLG 0
+#define wxUSE_PROGRESSDLG 0
+#define wxUSE_BUSYINFO 0
+#define wxUSE_DIRDLG 0
+#define wxUSE_FONTDLG 0
+#define wxUSE_FILEDLG 0
+#define wxUSE_TEXTDLG 0
+#define wxUSE_CHOICEDLG 0
+#define wxUSE_NUMBERDLG 0
+#define wxUSE_STARTUP_TIPS 0
+#define wxUSE_MSGDLG 1
+#define wxUSE_SPLITTER 1
+#define wxUSE_TAB_DIALOG 0
+
+#define wxUSE_METAFILE 0
+#define wxUSE_ENH_METAFILE 0
+#define wxUSE_WIN_METAFILES_ALWAYS 0
+#define wxUSE_DOC_VIEW_ARCHITECTURE 0
+#define wxUSE_MDI_ARCHITECTURE 0
+#define wxUSE_PRINTING_ARCHITECTURE 0
+#define wxUSE_HTML 0
+#define wxUSE_PLOT 0
+#define wxUSE_GLCANVAS 0
+#define wxUSE_TREELAYOUT 0
+#define wxUSE_IPC 0
+#define wxUSE_HELP 0
+#define wxUSE_MS_HTML_HELP 0
+#define wxUSE_RESOURCES 0
+#define wxUSE_CONSTRAINTS 1
+#define wxUSE_CLIPBOARD 0
+#define wxUSE_DATAOBJ 1
+#define wxUSE_SPLINES 0
+#define wxUSE_DRAG_AND_DROP 0
+#define wxUSE_XPM_IN_MSW 1
+#define wxUSE_XPM 1
+#define wxUSE_IMAGE_LOADING_IN_MSW 1
+#define wxUSE_RESOURCE_LOADING_IN_MSW 0
+#define wxUSE_WX_RESOURCES 0
+#define wxUSE_POSTSCRIPT 0
+#define wxUSE_AFM_FOR_POSTSCRIPT 0
+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
+#define wxUSE_ODBC 0
+#define wxODBC_FWD_ONLY_CURSORS 0
+#define wxODBC_BACKWARD_COMPATABILITY 0
+#define REMOVE_UNUSED_ARG 1
+#define wxUSE_IOSTREAMH 0
+#define wxUSE_LIBPNG 0
+#define wxUSE_LIBJPEG 0
+#define wxUSE_LIBTIFF 0
+#define wxUSE_GIF 0
+#define wxUSE_PNM 0
+#define wxUSE_PCX 0
+#define wxUSE_MFC 0
+#define wxUSE_OLE 0
+#define wxUSE_CTL3D 0
+#define wxUSE_ITSY_BITSY 0
+#define wxUSE_DYNAMIC_CLASSES 1
+
+
+#else
#define wxUSE_GUI 1
#define WXWIN_COMPATIBILITY 0
@@ -163,4 +318,6 @@
#define wxUSE_ITSY_BITSY 0
#define wxUSE_DYNAMIC_CLASSES 1
+#endif
+
#endif // _WX_UNIV_SETUP_H_
diff --git a/include/wx/univ/theme.h b/include/wx/univ/theme.h
index c60cd4aa19..a22293cfa1 100644
--- a/include/wx/univ/theme.h
+++ b/include/wx/univ/theme.h
@@ -69,8 +69,11 @@ private:
// the current theme
static wxTheme *ms_theme;
-
+#ifdef __MWERKS__
+ friend class wxThemeInfo;
+#else
friend wxThemeInfo;
+#endif
};
// ----------------------------------------------------------------------------
diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index 39949a871f..baabd53502 100644
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -61,6 +61,8 @@ enum
#define wxWindowNative wxWindowGTK
#elif defined(__WXMGL__)
#define wxWindowNative wxWindowMGL
+#elif defined(__WXMAC__)
+#define wxWindowNative wxWindowMac
#endif
class WXDLLEXPORT wxWindow : public wxWindowNative
diff --git a/include/wx/window.h b/include/wx/window.h
index bbcd44aa98..c1565a6520 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -973,6 +973,12 @@ private:
#elif defined(__WXQT__)
#include "wx/qt/window.h"
#elif defined(__WXMAC__)
+ #ifdef __WXUNIVERSAL__
+ #define wxWindowNative wxWindowMac
+ #else // !wxUniv
+ #define wxWindowMac wxWindow
+ #define sm_classwxWindowMac sm_classwxWindow
+ #endif // wxUniv
#include "wx/mac/window.h"
#elif defined(__WXPM__)
#include "wx/os2/window.h"
diff --git a/include/wx/wx_cwu_d.h b/include/wx/wx_cwu_d.h
new file mode 100644
index 0000000000..5a6123d024
--- /dev/null
+++ b/include/wx/wx_cwu_d.h
@@ -0,0 +1,46 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: wx_cw_d.h
+// Purpose: wxWindows definitions for CodeWarrior builds (Debug)
+// Author: Stefan Csomor
+// Modified by:
+// Created: 12/10/98
+// RCS-ID: $Id$
+// Copyright: (c) Stefan Csomor
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_CW__
+#define _WX_CW__
+
+#if __MWERKS__ >= 0x2400
+#pragma old_argmatch on
+#endif
+
+#if __option(profile)
+#error "profiling is not supported in debug versions"
+#else
+#ifdef __cplusplus
+ #if __POWERPC__
+ #include <wx_PPCu++_d.mch>
+ #elif __INTEL__
+ #include <wx_x86u++_d.mch>
+ #elif __CFM68K__
+ #include <wx_cfmu++_d.mch>
+ #else
+ #include <wx_68ku++_d.mch>
+ #endif
+#else
+ #if __POWERPC__
+ #include <wx_PPCu_d.mch>
+ #elif __INTEL__
+ #include <wx_x86u_d.mch>
+ #elif __CFM68K__
+ #include <wx_cfmu_d.mch>
+ #else
+ #include <wx_68ku_d.mch>
+ #endif
+#endif
+#endif
+
+#endif
+ // _WX_CW__
diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index ea2a3696da..26ce087d2e 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -568,6 +568,10 @@ WXDLLEXPORT wxChar * wxStrdup(const wxChar *psz);
WXDLLEXPORT int wxStricmp(const wxChar *psz1, const wxChar *psz2);
#endif
+#ifndef wxStrnicmp
+WXDLLEXPORT int wxStrnicmp(const wxChar *psz1, const wxChar *psz2, size_t len);
+#endif
+
#ifndef wxStrtok
WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr);
#endif
diff --git a/include/wx_cwu_d.pch b/include/wx_cwu_d.pch
new file mode 100644
index 0000000000..8f6d3313e1
--- /dev/null
+++ b/include/wx_cwu_d.pch
@@ -0,0 +1,25 @@
+#if __option (profile)
+ #error "profiling is not supported for debug targets"
+#else
+#if __POWERPC__
+ #pragma precompile_target "wx_PPCu_d.mch"
+#elif __INTEL__
+ #pragma precompile_target "wx_x86u_d.mch"
+#elif __CFM68K__
+ #pragma precompile_target "wx_cfmu_d.mch"
+#else
+ #pragma precompile_target "wx_68ku_d.mch"
+#endif
+#endif
+
+#pragma once on
+#undef WX_PRECOMP
+#define __WXUNIVERSAL__ 1
+#define __WXDEBUG__ 1
+#define wxUSE_GUI 1
+#define OLDP2C 1
+#include "wx/wx_cw_cm.h"
+#ifdef __WXMSW__
+ #include <windows.h>
+ #include "wx/msw/winundef.h"
+#endif
diff --git a/include/wx_cwu_d.pch++ b/include/wx_cwu_d.pch++
new file mode 100644
index 0000000000..ad39db9f6a
--- /dev/null
+++ b/include/wx_cwu_d.pch++
@@ -0,0 +1,24 @@
+#if __option (profile)
+ #error "profiling is not supported for debug targets"
+#else
+#if __POWERPC__
+ #pragma precompile_target "wx_PPCu++_d.mch"
+#elif __INTEL__
+ #pragma precompile_target "wx_x86u++_d.mch"
+#elif __CFM68K__
+ #pragma precompile_target "wx_cfmu++_d.mch"
+#else
+ #pragma precompile_target "wx_68ku++_d.mch"
+#endif
+#endif
+
+#pragma once on
+#define WX_PRECOMP
+#define __WXUNIVERSAL__ 1
+#define __WXDEBUG__ 1
+#define wxUSE_GUI 1
+#define OLDP2C 1
+#include "wx/wx_cw_cm.h"
+#ifdef WX_PRECOMP
+ #include "wx/wxprec.h"
+#endif
\ No newline at end of file
diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index f9e73aed8a..d404a98cb8 100644
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -168,6 +168,19 @@ int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2)
}
#endif
+#ifndef wxStricmp
+int WXDLLEXPORT wxStrnicmp(const wxChar *s1, const wxChar *s2, size_t n)
+{
+ register wxChar c1, c2;
+ while (n && ((c1 = wxTolower(*s1)) == (c2 = wxTolower(*s2)) ) && c1) n--, s1++, s2++;
+ if (n) {
+ if (c1 < c2) return -1;
+ if (c1 > c2) return 1;
+ }
+ return 0;
+}
+#endif
+
#ifndef wxStrtok
WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
{
diff --git a/src/jpeg/makemac.mcp b/src/jpeg/makemac.mcp
index 252275147e..604d72efa1 100644
Binary files a/src/jpeg/makemac.mcp and b/src/jpeg/makemac.mcp differ
diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 8d97ce4889..99ee68a0fb 100644
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -48,7 +48,7 @@ wxWindowDC::wxWindowDC()
wxWindowDC::wxWindowDC(wxWindow *the_canvas)
{
WindowRef windowref ;
- wxWindow* rootwindow ;
+ wxWindowMac* rootwindow ;
// this time it is really the full window
@@ -78,7 +78,7 @@ wxClientDC::wxClientDC()
wxClientDC::wxClientDC(wxWindow *window)
{
WindowRef windowref ;
- wxWindow* rootwindow ;
+ wxWindowMac* rootwindow ;
window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
m_macPort = UMAGetWindowPort( windowref ) ;
@@ -106,7 +106,7 @@ wxPaintDC::wxPaintDC()
wxPaintDC::wxPaintDC(wxWindow *window)
{
WindowRef windowref ;
- wxWindow* rootwindow ;
+ wxWindowMac* rootwindow ;
window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index bbbef8f74b..6bde00fc74 100644
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: frame.cpp
-// Purpose: wxFrame
+// Purpose: wxFrameMac
// Author: AUTHOR
// Modified by:
// Created: ??/??/98
@@ -29,22 +29,25 @@ extern wxList wxModelessWindows;
extern wxList wxPendingDelete;
#if !USE_SHARED_LIBRARY
-BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
-// EVT_SIZE(wxFrame::OnSize)
- EVT_ACTIVATE(wxFrame::OnActivate)
- // EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
- EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
-// EVT_IDLE(wxFrame::OnIdle)
-// EVT_CLOSE(wxFrame::OnCloseWindow)
+BEGIN_EVENT_TABLE(wxFrameMac, wxFrameBase)
+// EVT_SIZE(wxFrameMac::OnSize)
+ EVT_ACTIVATE(wxFrameMac::OnActivate)
+ // EVT_MENU_HIGHLIGHT_ALL(wxFrameMac::OnMenuHighlight)
+ EVT_SYS_COLOUR_CHANGED(wxFrameMac::OnSysColourChanged)
+// EVT_IDLE(wxFrameMac::OnIdle)
+// EVT_CLOSE(wxFrameMac::OnCloseWindow)
END_EVENT_TABLE()
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxFrameMac, wxWindow)
+#endif
+#ifndef __WXUNIVERSAL__
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMac)
#endif
#if wxUSE_NATIVE_STATUSBAR
-bool wxFrame::m_useNativeStatusBar = TRUE;
+bool wxFrameMac::m_useNativeStatusBar = TRUE;
#else
-bool wxFrame::m_useNativeStatusBar = FALSE;
+bool wxFrameMac::m_useNativeStatusBar = FALSE;
#endif
#define WX_MAC_STATUSBAR_HEIGHT 15
@@ -52,7 +55,7 @@ bool wxFrame::m_useNativeStatusBar = FALSE;
// creation/destruction
// ----------------------------------------------------------------------------
-void wxFrame::Init()
+void wxFrameMac::Init()
{
m_frameMenuBar = NULL;
@@ -69,7 +72,7 @@ void wxFrame::Init()
#endif
}
-wxPoint wxFrame::GetClientAreaOrigin() const
+wxPoint wxFrameMac::GetClientAreaOrigin() const
{
// on mac we are at position -1,-1 with the control
wxPoint pt(0, 0);
@@ -94,7 +97,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
return pt;
}
-bool wxFrame::Create(wxWindow *parent,
+bool wxFrameMac::Create(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos,
@@ -123,7 +126,7 @@ bool wxFrame::Create(wxWindow *parent,
return TRUE;
}
-wxFrame::~wxFrame()
+wxFrameMac::~wxFrameMac()
{
m_isBeingDeleted = TRUE;
wxTopLevelWindows.DeleteObject(this);
@@ -146,7 +149,7 @@ wxFrame::~wxFrame()
}
-bool wxFrame::Enable(bool enable)
+bool wxFrameMac::Enable(bool enable)
{
if ( !wxWindow::Enable(enable) )
return FALSE;
@@ -162,40 +165,40 @@ bool wxFrame::Enable(bool enable)
return TRUE;
}
// Equivalent to maximize/restore in Windows
-void wxFrame::Maximize(bool maximize)
+void wxFrameMac::Maximize(bool maximize)
{
// TODO
}
-bool wxFrame::IsIconized() const
+bool wxFrameMac::IsIconized() const
{
// TODO
return FALSE;
}
-void wxFrame::Iconize(bool iconize)
+void wxFrameMac::Iconize(bool iconize)
{
// TODO
}
// Is the frame maximized?
-bool wxFrame::IsMaximized(void) const
+bool wxFrameMac::IsMaximized(void) const
{
// TODO
return FALSE;
}
-void wxFrame::Restore()
+void wxFrameMac::Restore()
{
// TODO
}
-void wxFrame::SetIcon(const wxIcon& icon)
+void wxFrameMac::SetIcon(const wxIcon& icon)
{
wxFrameBase::SetIcon(icon);
}
-wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
+wxStatusBar *wxFrameMac::OnCreateStatusBar(int number, long style, wxWindowID id,
const wxString& name)
{
wxStatusBar *statusBar = NULL;
@@ -207,7 +210,7 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
return statusBar;
}
-void wxFrame::PositionStatusBar()
+void wxFrameMac::PositionStatusBar()
{
if (m_frameStatusBar )
{
@@ -222,7 +225,7 @@ void wxFrame::PositionStatusBar()
}
}
-void wxFrame::SetMenuBar(wxMenuBar *menuBar)
+void wxFrameMac::SetMenuBar(wxMenuBar *menuBar)
{
if (!menuBar)
{
@@ -231,12 +234,12 @@ void wxFrame::SetMenuBar(wxMenuBar *menuBar)
m_frameMenuBar = menuBar;
// m_frameMenuBar->MacInstallMenuBar() ;
- m_frameMenuBar->Attach(this);
+ m_frameMenuBar->Attach((wxFrame *)this);
}
// Responds to colour changes, and passes event on to children.
-void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxFrameMac::OnSysColourChanged(wxSysColourChangedEvent& event)
{
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
Refresh();
@@ -255,7 +258,7 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
// Default activation behaviour - set the focus for the first child
// subwindow found.
-void wxFrame::OnActivate(wxActivateEvent& event)
+void wxFrameMac::OnActivate(wxActivateEvent& event)
{
if ( !event.GetActive() )
{
@@ -307,7 +310,7 @@ void wxFrame::OnActivate(wxActivateEvent& event)
}
}
-void wxFrame::DoGetClientSize(int *x, int *y) const
+void wxFrameMac::DoGetClientSize(int *x, int *y) const
{
wxWindow::DoGetClientSize( x , y ) ;
@@ -325,7 +328,7 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
*x -= pt.x;
}
-void wxFrame::DoSetClientSize(int clientwidth, int clientheight)
+void wxFrameMac::DoSetClientSize(int clientwidth, int clientheight)
{
int currentclientwidth , currentclientheight ;
int currentwidth , currentheight ;
@@ -345,7 +348,7 @@ void wxFrame::DoSetClientSize(int clientwidth, int clientheight)
#if wxUSE_TOOLBAR
-wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
+wxToolBar* wxFrameMac::CreateToolBar(long style, wxWindowID id, const wxString& name)
{
if ( wxFrameBase::CreateToolBar(style, id, name) )
{
@@ -355,7 +358,7 @@ wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& nam
return m_frameToolBar;
}
-void wxFrame::PositionToolBar()
+void wxFrameMac::PositionToolBar()
{
int cw, ch;
diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 78d6f24710..35f8c0ef6d 100644
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: windows.cpp
-// Purpose: wxWindow
+// Purpose: wxWindowMac
// Author: AUTHOR
// Modified by:
// Created: ??/??/98
@@ -54,16 +54,16 @@
#include <string.h>
extern wxList wxPendingDelete;
-wxWindow* gFocusWindow = NULL ;
+wxWindowMac* gFocusWindow = NULL ;
#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
-BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
- EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
- EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
- EVT_INIT_DIALOG(wxWindow::OnInitDialog)
- EVT_IDLE(wxWindow::OnIdle)
- EVT_SET_FOCUS(wxWindow::OnSetFocus)
+IMPLEMENT_DYNAMIC_CLASS(wxWindowMac, wxEvtHandler)
+BEGIN_EVENT_TABLE(wxWindowMac, wxEvtHandler)
+ EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
+ EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged)
+ EVT_INIT_DIALOG(wxWindowMac::OnInitDialog)
+ EVT_IDLE(wxWindowMac::OnIdle)
+ EVT_SET_FOCUS(wxWindowMac::OnSetFocus)
END_EVENT_TABLE()
#endif
@@ -75,21 +75,21 @@ END_EVENT_TABLE()
// ===========================================================================
// ---------------------------------------------------------------------------
-// wxWindow utility functions
+// wxWindowMac utility functions
// ---------------------------------------------------------------------------
// Find an item given the Macintosh Window Reference
wxList *wxWinMacWindowList = NULL;
-wxWindow *wxFindWinFromMacWindow(WindowRef inWindowRef)
+wxWindowMac *wxFindWinFromMacWindow(WindowRef inWindowRef)
{
wxNode *node = wxWinMacWindowList->Find((long)inWindowRef);
if (!node)
return NULL;
- return (wxWindow *)node->Data();
+ return (wxWindowMac *)node->Data();
}
-void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindow *win)
+void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindowMac *win)
{
// adding NULL WindowRef is (first) surely a result of an error and
// (secondly) breaks menu command processing
@@ -99,7 +99,7 @@ void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindow *win)
wxWinMacWindowList->Append((long)inWindowRef, win);
}
-void wxRemoveMacWindowAssociation(wxWindow *win)
+void wxRemoveMacWindowAssociation(wxWindowMac *win)
{
wxWinMacWindowList->DeleteObject(win);
}
@@ -108,9 +108,9 @@ void wxRemoveMacWindowAssociation(wxWindow *win)
// constructors and such
// ----------------------------------------------------------------------------
-WindowRef wxWindow::s_macWindowInUpdate = NULL;
+WindowRef wxWindowMac::s_macWindowInUpdate = NULL;
-void wxWindow::Init()
+void wxWindowMac::Init()
{
// generic
InitBase();
@@ -150,11 +150,11 @@ void wxWindow::Init()
}
// Destructor
-wxWindow::~wxWindow()
+wxWindowMac::~wxWindowMac()
{
// deleting a window while it is shown invalidates the region
if ( IsShown() ) {
- wxWindow* iter = this ;
+ wxWindowMac* iter = this ;
while( iter ) {
if ( iter->m_macWindowData )
{
@@ -193,13 +193,13 @@ wxWindow::~wxWindow()
}
// Constructor
-bool wxWindow::Create(wxWindow *parent, wxWindowID id,
+bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style,
const wxString& name)
{
- wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") );
+ wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindowMac without parent") );
if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
return FALSE;
@@ -211,16 +211,16 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
AdjustForParentClientOrigin(m_x, m_y, wxSIZE_USE_EXISTING);
m_width = WidthDefault( size.x );
m_height = HeightDefault( size.y ) ;
-
+#ifndef __WXUNIVERSAL__
if ( ! IsKindOf( CLASSINFO ( wxControl ) ) && ! IsKindOf( CLASSINFO( wxStatusBar ) ) )
{
MacCreateScrollBars( style ) ;
}
-
+#endif
return TRUE;
}
-void wxWindow::SetFocus()
+void wxWindowMac::SetFocus()
{
if ( gFocusWindow == this )
return ;
@@ -236,12 +236,14 @@ void wxWindow::SetFocus()
gFocusWindow->m_caret->OnKillFocus();
}
#endif // wxUSE_CARET
+ #ifndef __WXUNIVERSAL__
wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
if ( control && control->GetMacControl() )
{
UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl() , kControlFocusNoPart ) ;
control->MacRedrawControl() ;
}
+ #endif
wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId);
event.SetEventObject(gFocusWindow);
gFocusWindow->GetEventHandler()->ProcessEvent(event) ;
@@ -259,14 +261,15 @@ void wxWindow::SetFocus()
wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
if ( panel )
{
- panel->SetLastFocus(this);
+ panel->SetLastFocus((wxWindow*)this);
}
+ #ifndef __WXUNIVERSAL__
wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
if ( control && control->GetMacControl() )
{
UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl() , kControlEditTextPart ) ;
}
-
+ #endif
wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event) ;
@@ -274,7 +277,7 @@ void wxWindow::SetFocus()
}
}
-bool wxWindow::Enable(bool enable)
+bool wxWindowMac::Enable(bool enable)
{
if ( !wxWindowBase::Enable(enable) )
return FALSE;
@@ -282,7 +285,7 @@ bool wxWindow::Enable(bool enable)
wxWindowList::Node *node = GetChildren().GetFirst();
while ( node )
{
- wxWindow *child = node->GetData();
+ wxWindowMac *child = node->GetData();
child->Enable(enable);
node = node->GetNext();
@@ -291,7 +294,7 @@ bool wxWindow::Enable(bool enable)
return TRUE;
}
-void wxWindow::CaptureMouse()
+void wxWindowMac::CaptureMouse()
{
wxTheApp->s_captureWindow = this ;
}
@@ -301,14 +304,14 @@ wxWindow* wxWindowBase::GetCapture()
return wxTheApp->s_captureWindow ;
}
-void wxWindow::ReleaseMouse()
+void wxWindowMac::ReleaseMouse()
{
wxTheApp->s_captureWindow = NULL ;
}
#if wxUSE_DRAG_AND_DROP
-void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
+void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
{
if ( m_pDropTarget != 0 ) {
delete m_pDropTarget;
@@ -324,19 +327,19 @@ void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
#endif
// Old style file-manager drag&drop
-void wxWindow::DragAcceptFiles(bool accept)
+void wxWindowMac::DragAcceptFiles(bool accept)
{
// TODO
}
// Get total size
-void wxWindow::DoGetSize(int *x, int *y) const
+void wxWindowMac::DoGetSize(int *x, int *y) const
{
*x = m_width ;
*y = m_height ;
}
-void wxWindow::DoGetPosition(int *x, int *y) const
+void wxWindowMac::DoGetPosition(int *x, int *y) const
{
*x = m_x ;
*y = m_y ;
@@ -348,8 +351,8 @@ void wxWindow::DoGetPosition(int *x, int *y) const
}
}
-
-bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
+#if wxUSE_MENUS
+bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
{
menu->SetInvokingWindow(this);
menu->UpdateUI();
@@ -363,8 +366,9 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
return TRUE;
}
+#endif
-void wxWindow::DoScreenToClient(int *x, int *y) const
+void wxWindowMac::DoScreenToClient(int *x, int *y) const
{
WindowRef window = GetMacRootWindow() ;
@@ -384,7 +388,7 @@ void wxWindow::DoScreenToClient(int *x, int *y) const
MacRootWindowToClient( x , y ) ;
}
-void wxWindow::DoClientToScreen(int *x, int *y) const
+void wxWindowMac::DoClientToScreen(int *x, int *y) const
{
WindowRef window = GetMacRootWindow() ;
@@ -404,7 +408,7 @@ void wxWindow::DoClientToScreen(int *x, int *y) const
*y = localwhere.v ;
}
-void wxWindow::MacClientToRootWindow( int *x , int *y ) const
+void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const
{
if ( m_macWindowData )
{
@@ -417,7 +421,7 @@ void wxWindow::MacClientToRootWindow( int *x , int *y ) const
}
}
-void wxWindow::MacRootWindowToClient( int *x , int *y ) const
+void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const
{
if ( m_macWindowData )
{
@@ -430,7 +434,7 @@ void wxWindow::MacRootWindowToClient( int *x , int *y ) const
}
}
-bool wxWindow::SetCursor(const wxCursor& cursor)
+bool wxWindowMac::SetCursor(const wxCursor& cursor)
{
if (m_cursor == cursor)
return FALSE;
@@ -450,7 +454,7 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
wxT("cursor must be valid after call to the base version"));
Point pt ;
- wxWindow *mouseWin ;
+ wxWindowMac *mouseWin ;
GetMouse( &pt ) ;
// Change the cursor NOW if we're within the correct window
@@ -468,7 +472,7 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
// Get size *available for subwindows* i.e. excluding menu bar etc.
-void wxWindow::DoGetClientSize(int *x, int *y) const
+void wxWindowMac::DoGetClientSize(int *x, int *y) const
{
*x = m_width ;
*y = m_height ;
@@ -487,7 +491,7 @@ void wxWindow::DoGetClientSize(int *x, int *y) const
MacClientToRootWindow( &w , &h ) ;
WindowRef window = NULL ;
- wxWindow *iter = (wxWindow*)this ;
+ wxWindowMac *iter = (wxWindowMac*)this ;
int totW = 10000 , totH = 10000;
while( iter )
@@ -528,7 +532,7 @@ void wxWindow::DoGetClientSize(int *x, int *y) const
#if wxUSE_TOOLTIPS
-void wxWindow::DoSetToolTip(wxToolTip *tooltip)
+void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
{
wxWindowBase::DoSetToolTip(tooltip);
@@ -538,7 +542,7 @@ void wxWindow::DoSetToolTip(wxToolTip *tooltip)
#endif // wxUSE_TOOLTIPS
-void wxWindow::DoMoveWindow(int x, int y, int width, int height)
+void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
{
DoSetSize( x,y, width, height ) ;
}
@@ -551,7 +555,7 @@ void wxWindow::DoMoveWindow(int x, int y, int width, int height)
// If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate
// the width/height to best suit our contents, otherwise we reuse the current
// width/height
-void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int former_x = m_x ;
@@ -689,7 +693,7 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
}
if ( doMove )
- wxWindow::MacSuperChangedPosition() ; // like this only children will be notified
+ wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
}
MacRepositionScrollBars() ;
if ( doMove )
@@ -712,14 +716,14 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
// For implementation purposes - sometimes decorations make the client area
// smaller
-wxPoint wxWindow::GetClientAreaOrigin() const
+wxPoint wxWindowMac::GetClientAreaOrigin() const
{
return wxPoint(MacGetLeftBorderSize( ) , MacGetTopBorderSize( ) );
}
// Makes an adjustment to the window position (for example, a frame that has
// a toolbar that it manages itself).
-void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
+void wxWindowMac::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
{
if( !m_macWindowData )
{
@@ -731,7 +735,7 @@ void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
}
}
-void wxWindow::SetTitle(const wxString& title)
+void wxWindowMac::SetTitle(const wxString& title)
{
m_label = title ;
@@ -746,12 +750,12 @@ void wxWindow::SetTitle(const wxString& title)
UMASetWTitleC( m_macWindowData->m_macWindow , label ) ;
}
-wxString wxWindow::GetTitle() const
+wxString wxWindowMac::GetTitle() const
{
return m_label ;
}
-bool wxWindow::Show(bool show)
+bool wxWindowMac::Show(bool show)
{
if ( !wxWindowBase::Show(show) )
return FALSE;
@@ -778,7 +782,7 @@ bool wxWindow::Show(bool show)
if ( !show )
{
WindowRef window = GetMacRootWindow() ;
- wxWindow* win = wxFindWinFromMacWindow( window ) ;
+ wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
if ( !win->m_isBeingDeleted )
Refresh() ;
}
@@ -790,19 +794,19 @@ bool wxWindow::Show(bool show)
return TRUE;
}
-void wxWindow::MacSuperShown( bool show )
+void wxWindowMac::MacSuperShown( bool show )
{
wxNode *node = GetChildren().First();
while ( node )
{
- wxWindow *child = (wxWindow *)node->Data();
+ wxWindowMac *child = (wxWindowMac *)node->Data();
if ( child->m_isShown )
child->MacSuperShown( show ) ;
node = node->Next();
}
}
-bool wxWindow::MacIsReallyShown() const
+bool wxWindowMac::MacIsReallyShown() const
{
if ( m_isShown && (m_parent != NULL) ) {
return m_parent->MacIsReallyShown();
@@ -810,7 +814,7 @@ bool wxWindow::MacIsReallyShown() const
return m_isShown;
/*
bool status = m_isShown ;
- wxWindow * win = this ;
+ wxWindowMac * win = this ;
while ( status && win->m_parent != NULL )
{
win = win->m_parent ;
@@ -820,26 +824,26 @@ bool wxWindow::MacIsReallyShown() const
*/
}
-int wxWindow::GetCharHeight() const
+int wxWindowMac::GetCharHeight() const
{
- wxClientDC dc ( (wxWindow*)this ) ;
+ wxClientDC dc ( (wxWindowMac*)this ) ;
return dc.GetCharHeight() ;
}
-int wxWindow::GetCharWidth() const
+int wxWindowMac::GetCharWidth() const
{
- wxClientDC dc ( (wxWindow*)this ) ;
+ wxClientDC dc ( (wxWindowMac*)this ) ;
return dc.GetCharWidth() ;
}
-void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
+void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,
int *descent, int *externalLeading, const wxFont *theFont ) const
{
const wxFont *fontToUse = theFont;
if ( !fontToUse )
fontToUse = &m_font;
- wxClientDC dc( (wxWindow*) this ) ;
+ wxClientDC dc( (wxWindowMac*) this ) ;
long lx,ly,ld,le ;
dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
if ( externalLeading )
@@ -852,7 +856,7 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
*y = ly ;
}
-void wxWindow::MacEraseBackground( Rect *rect )
+void wxWindowMac::MacEraseBackground( Rect *rect )
{
/*
WindowRef window = GetMacRootWindow() ;
@@ -866,7 +870,7 @@ void wxWindow::MacEraseBackground( Rect *rect )
// it is on a notebook panel or not, in order to take care of that we walk up the hierarchy until we have
// either a non gray background color or a non control window
- wxWindow* parent = GetParent() ;
+ wxWindowMac* parent = GetParent() ;
while( parent )
{
if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) )
@@ -907,7 +911,7 @@ void wxWindow::MacEraseBackground( Rect *rect )
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
- wxWindow *child = (wxWindow*)node->Data();
+ wxWindowMac *child = (wxWindowMac*)node->Data();
Rect clientrect = { child->m_x , child->m_y , child->m_x +child->m_width , child->m_y + child->m_height } ;
SectRect( &clientrect , rect , &clientrect ) ;
@@ -925,7 +929,7 @@ void wxWindow::MacEraseBackground( Rect *rect )
*/
}
-void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
+void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
{
// if ( !IsShown() )
// return ;
@@ -952,13 +956,13 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
}
// Responds to colour changes: passes event on to children.
-void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxWindowMac::OnSysColourChanged(wxSysColourChangedEvent& event)
{
wxNode *node = GetChildren().First();
while ( node )
{
// Only propagate to non-top-level windows
- wxWindow *win = (wxWindow *)node->Data();
+ wxWindowMac *win = (wxWindowMac *)node->Data();
if ( win->GetParent() )
{
wxSysColourChangedEvent event2;
@@ -975,36 +979,36 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
// Caret manipulation
// ---------------------------------------------------------------------------
-void wxWindow::CreateCaret(int w, int h)
+void wxWindowMac::CreateCaret(int w, int h)
{
SetCaret(new wxCaret(this, w, h));
}
-void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
+void wxWindowMac::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
{
wxFAIL_MSG("not implemented");
}
-void wxWindow::ShowCaret(bool show)
+void wxWindowMac::ShowCaret(bool show)
{
wxCHECK_RET( m_caret, "no caret to show" );
m_caret->Show(show);
}
-void wxWindow::DestroyCaret()
+void wxWindowMac::DestroyCaret()
{
SetCaret(NULL);
}
-void wxWindow::SetCaretPos(int x, int y)
+void wxWindowMac::SetCaretPos(int x, int y)
{
wxCHECK_RET( m_caret, "no caret to move" );
m_caret->Move(x, y);
}
-void wxWindow::GetCaretPos(int *x, int *y) const
+void wxWindowMac::GetCaretPos(int *x, int *y) const
{
wxCHECK_RET( m_caret, "no caret to get position of" );
@@ -1012,24 +1016,24 @@ void wxWindow::GetCaretPos(int *x, int *y) const
}
#endif // wxUSE_CARET
-wxWindow *wxGetActiveWindow()
+wxWindowMac *wxGetActiveWindow()
{
// actually this is a windows-only concept
return NULL;
}
// Coordinates relative to the window
-void wxWindow::WarpPointer (int x_pos, int y_pos)
+void wxWindowMac::WarpPointer (int x_pos, int y_pos)
{
// We really dont move the mouse programmatically under mac
}
-void wxWindow::OnEraseBackground(wxEraseEvent& event)
+void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
{
// TODO : probably we would adopt the EraseEvent structure
}
-int wxWindow::GetScrollPos(int orient) const
+int wxWindowMac::GetScrollPos(int orient) const
{
if ( orient == wxHORIZONTAL )
{
@@ -1046,7 +1050,7 @@ int wxWindow::GetScrollPos(int orient) const
// This now returns the whole range, not just the number
// of positions that we can scroll.
-int wxWindow::GetScrollRange(int orient) const
+int wxWindowMac::GetScrollRange(int orient) const
{
if ( orient == wxHORIZONTAL )
{
@@ -1061,7 +1065,7 @@ int wxWindow::GetScrollRange(int orient) const
return 0;
}
-int wxWindow::GetScrollThumb(int orient) const
+int wxWindowMac::GetScrollThumb(int orient) const
{
if ( orient == wxHORIZONTAL )
{
@@ -1076,7 +1080,7 @@ int wxWindow::GetScrollThumb(int orient) const
return 0;
}
-void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
+void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh)
{
if ( orient == wxHORIZONTAL )
{
@@ -1090,7 +1094,7 @@ void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
}
}
-void wxWindow::MacCreateRealWindow( const wxString& title,
+void wxWindowMac::MacCreateRealWindow( const wxString& title,
const wxPoint& pos,
const wxSize& size,
long style,
@@ -1179,11 +1183,11 @@ void wxWindow::MacCreateRealWindow( const wxString& title,
m_macWindowData->m_macHasReceivedFirstActivate = true ;
}
-void wxWindow::MacPaint( wxPaintEvent &event )
+void wxWindowMac::MacPaint( wxPaintEvent &event )
{
}
-void wxWindow::MacPaintBorders( )
+void wxWindowMac::MacPaintBorders( )
{
if( m_macWindowData )
return ;
@@ -1297,7 +1301,7 @@ void wxWindow::MacPaintBorders( )
}
// New function that will replace some of the above.
-void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
+void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
int range, bool refresh)
{
if ( orient == wxHORIZONTAL )
@@ -1338,7 +1342,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
}
// Does a physical scroll
-void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
+void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
{
wxMacDrawingClientHelper focus( this ) ;
if ( focus.Ok() )
@@ -1362,7 +1366,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
- wxWindow *child = (wxWindow*)node->Data();
+ wxWindowMac *child = (wxWindowMac*)node->Data();
if (child == m_vScrollBar) continue;
if (child == m_hScrollBar) continue;
if (child->IsTopLevel()) continue;
@@ -1375,7 +1379,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
}
-void wxWindow::MacOnScroll(wxScrollEvent &event )
+void wxWindowMac::MacOnScroll(wxScrollEvent &event )
{
if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar )
{
@@ -1410,7 +1414,7 @@ void wxWindow::MacOnScroll(wxScrollEvent &event )
}
}
-bool wxWindow::SetFont(const wxFont& font)
+bool wxWindowMac::SetFont(const wxFont& font)
{
if ( !wxWindowBase::SetFont(font) )
{
@@ -1422,7 +1426,7 @@ bool wxWindow::SetFont(const wxFont& font)
}
// Get the window with the focus
-wxWindow *wxWindowBase::FindFocus()
+wxWindowMac *wxWindowBase::FindFocus()
{
return gFocusWindow ;
}
@@ -1431,7 +1435,7 @@ wxWindow *wxWindowBase::FindFocus()
// If nothing defined for this, try the parent.
// E.g. we may be a button loaded from a resource, with no callback function
// defined.
-void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event)
+void wxWindowMac::OnCommand(wxWindowMac& win, wxCommandEvent& event)
{
if ( GetEventHandler()->ProcessEvent(event) )
return;
@@ -1441,7 +1445,7 @@ void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event)
#endif // WXWIN_COMPATIBILITY_2
#if WXWIN_COMPATIBILITY
-wxObject* wxWindow::GetChild(int number) const
+wxObject* wxWindowMac::GetChild(int number) const
{
// Return a pointer to the Nth object in the Panel
wxNode *node = GetChildren().First();
@@ -1458,7 +1462,7 @@ wxObject* wxWindow::GetChild(int number) const
}
#endif // WXWIN_COMPATIBILITY
-void wxWindow::OnSetFocus(wxFocusEvent& event)
+void wxWindowMac::OnSetFocus(wxFocusEvent& event)
{
// panel wants to track the window which was the last to have focus in it,
// so we want to set ourselves as the window which last had focus
@@ -1466,10 +1470,10 @@ void wxWindow::OnSetFocus(wxFocusEvent& event)
// notice that it's also important to do it upwards the tree becaus
// otherwise when the top level panel gets focus, it won't set it back to
// us, but to some other sibling
- wxWindow *win = this;
+ wxWindowMac *win = this;
while ( win )
{
- wxWindow *parent = win->GetParent();
+ wxWindowMac *parent = win->GetParent();
wxPanel *panel = wxDynamicCast(parent, wxPanel);
if ( panel )
{
@@ -1482,7 +1486,7 @@ void wxWindow::OnSetFocus(wxFocusEvent& event)
event.Skip();
}
-void wxWindow::Clear()
+void wxWindowMac::Clear()
{
if ( m_macWindowData )
{
@@ -1504,13 +1508,13 @@ void wxWindow::Clear()
}
// Setup background and foreground colours correctly
-void wxWindow::SetupColours()
+void wxWindowMac::SetupColours()
{
if ( GetParent() )
SetBackgroundColour(GetParent()->GetBackgroundColour());
}
-void wxWindow::OnIdle(wxIdleEvent& event)
+void wxWindowMac::OnIdle(wxIdleEvent& event)
{
/*
// Check if we need to send a LEAVE event
@@ -1533,7 +1537,7 @@ void wxWindow::OnIdle(wxIdleEvent& event)
}
// Raise the window to the top of the Z order
-void wxWindow::Raise()
+void wxWindowMac::Raise()
{
if ( m_macWindowData )
{
@@ -1542,7 +1546,7 @@ void wxWindow::Raise()
}
// Lower the window to the bottom of the Z order
-void wxWindow::Lower()
+void wxWindowMac::Lower()
{
if ( m_macWindowData )
{
@@ -1550,7 +1554,7 @@ void wxWindow::Lower()
}
}
-void wxWindow::DoSetClientSize(int width, int height)
+void wxWindowMac::DoSetClientSize(int width, int height)
{
if ( width != -1 || height != -1 )
{
@@ -1568,9 +1572,9 @@ void wxWindow::DoSetClientSize(int width, int height)
}
-wxWindow* wxWindow::s_lastMouseWindow = NULL ;
+wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ;
-bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWin )
+bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin )
{
if ((point.x < m_x) || (point.y < m_y) ||
(point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
@@ -1585,7 +1589,7 @@ bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWi
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
- wxWindow *child = (wxWindow*)node->Data();
+ wxWindowMac *child = (wxWindowMac*)node->Data();
// added the m_isShown test --dmazzoni
if ( child->GetMacRootWindow() == window && child->m_isShown )
{
@@ -1598,14 +1602,14 @@ bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWi
return TRUE;
}
-bool wxWindow::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindow** outWin )
+bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin )
{
WindowRef window ;
Point pt = { screenpoint.y , screenpoint.x } ;
if ( ::FindWindow( pt , &window ) == 3 )
{
wxPoint point( screenpoint ) ;
- wxWindow* win = wxFindWinFromMacWindow( window ) ;
+ wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
if ( win )
{
win->ScreenToClient( point ) ;
@@ -1617,7 +1621,7 @@ bool wxWindow::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindow** ou
extern int wxBusyCursorCount ;
-bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event)
+bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
{
if ((event.m_x < m_x) || (event.m_y < m_y) ||
(event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
@@ -1637,7 +1641,7 @@ bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event)
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
- wxWindow *child = (wxWindow*)node->Data();
+ wxWindowMac *child = (wxWindowMac*)node->Data();
if ( child->GetMacRootWindow() == window && child->IsShown() && child->IsEnabled() )
{
if (child->MacDispatchMouseEvent(event))
@@ -1673,7 +1677,7 @@ bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event)
Point lastWhere ;
long lastWhen = 0 ;
-wxString wxWindow::MacGetToolTipString( wxPoint &pt )
+wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
{
if ( m_tooltip )
{
@@ -1681,7 +1685,7 @@ wxString wxWindow::MacGetToolTipString( wxPoint &pt )
}
return "" ;
}
-void wxWindow::MacFireMouseEvent( EventRecord *ev )
+void wxWindowMac::MacFireMouseEvent( EventRecord *ev )
{
wxMouseEvent event(wxEVT_LEFT_DOWN);
bool isDown = !(ev->modifiers & btnState) ; // 1 is for up
@@ -1780,12 +1784,12 @@ void wxWindow::MacFireMouseEvent( EventRecord *ev )
}
}
-void wxWindow::MacMouseDown( EventRecord *ev , short part)
+void wxWindowMac::MacMouseDown( EventRecord *ev , short part)
{
MacFireMouseEvent( ev ) ;
}
-void wxWindow::MacMouseUp( EventRecord *ev , short part)
+void wxWindowMac::MacMouseUp( EventRecord *ev , short part)
{
WindowPtr frontWindow ;
switch (part)
@@ -1798,7 +1802,7 @@ void wxWindow::MacMouseUp( EventRecord *ev , short part)
}
}
-void wxWindow::MacMouseMoved( EventRecord *ev , short part)
+void wxWindowMac::MacMouseMoved( EventRecord *ev , short part)
{
WindowPtr frontWindow ;
switch (part)
@@ -1810,7 +1814,7 @@ void wxWindow::MacMouseMoved( EventRecord *ev , short part)
break ;
}
}
-void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating )
+void wxWindowMac::MacActivate( EventRecord *ev , bool inIsActivating )
{
if ( !m_macWindowData->m_macHasReceivedFirstActivate )
m_macWindowData->m_macHasReceivedFirstActivate = true ;
@@ -1826,14 +1830,14 @@ void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating )
// MacUpdateImmediately() ;
}
-void wxWindow::MacRedraw( RgnHandle updatergn , long time)
+void wxWindowMac::MacRedraw( RgnHandle updatergn , long time)
{
// updatergn is always already clipped to our boundaries
WindowRef window = GetMacRootWindow() ;
// ownUpdateRgn is the area that this window has to invalidate i.e. its own area without its children
RgnHandle ownUpdateRgn = NewRgn() ;
CopyRgn( updatergn , ownUpdateRgn ) ;
- wxWindow* win = wxFindWinFromMacWindow( window ) ;
+ wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
{
wxMacDrawingHelper focus( this ) ; // was client
if ( focus.Ok() )
@@ -1853,7 +1857,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
// either a non gray background color or a non control window
- wxWindow* parent = GetParent() ;
+ wxWindowMac* parent = GetParent() ;
while( parent )
{
if ( parent->GetMacRootWindow() != window )
@@ -1902,7 +1906,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
RgnHandle childarea = NewRgn() ;
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
- wxWindow *child = (wxWindow*)node->Data();
+ wxWindowMac *child = (wxWindowMac*)node->Data();
// eventually test for transparent windows
if ( child->GetMacRootWindow() == window && child->IsShown() )
{
@@ -1953,7 +1957,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
- wxWindow *child = (wxWindow*)node->Data();
+ wxWindowMac *child = (wxWindowMac*)node->Data();
SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ;
SectRgn( childupdate , updatergn , childupdate ) ;
OffsetRgn( childupdate , -child->m_x , -child->m_y ) ;
@@ -1967,12 +1971,12 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
// eventually a draw grow box here
}
-void wxWindow::MacUpdateImmediately()
+void wxWindowMac::MacUpdateImmediately()
{
WindowRef window = GetMacRootWindow() ;
if ( window )
{
- wxWindow* win = wxFindWinFromMacWindow( window ) ;
+ wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
#if TARGET_CARBON
AGAPortHelper help( GetWindowPort(window) ) ;
#else
@@ -2000,10 +2004,10 @@ void wxWindow::MacUpdateImmediately()
}
}
-void wxWindow::MacUpdate( EventRecord *ev )
+void wxWindowMac::MacUpdate( EventRecord *ev )
{
WindowRef window = (WindowRef) ev->message ;
- wxWindow * win = wxFindWinFromMacWindow( window ) ;
+ wxWindowMac * win = wxFindWinFromMacWindow( window ) ;
#if TARGET_CARBON
AGAPortHelper help( GetWindowPort(window) ) ;
#else
@@ -2030,10 +2034,10 @@ void wxWindow::MacUpdate( EventRecord *ev )
EndUpdate( window ) ;
}
-WindowRef wxWindow::GetMacRootWindow() const
+WindowRef wxWindowMac::GetMacRootWindow() const
{
WindowRef window = NULL ;
- wxWindow *iter = (wxWindow*)this ;
+ wxWindowMac *iter = (wxWindowMac*)this ;
while( iter )
{
@@ -2046,7 +2050,7 @@ WindowRef wxWindow::GetMacRootWindow() const
return NULL ;
}
-void wxWindow::MacCreateScrollBars( long style )
+void wxWindowMac::MacCreateScrollBars( long style )
{
wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ;
@@ -2085,7 +2089,7 @@ void wxWindow::MacCreateScrollBars( long style )
MacRepositionScrollBars() ; // we might have a real position shift
}
-void wxWindow::MacRepositionScrollBars()
+void wxWindowMac::MacRepositionScrollBars()
{
bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;
@@ -2112,7 +2116,7 @@ void wxWindow::MacRepositionScrollBars()
MacClientToRootWindow( &w , &h ) ;
WindowRef window = NULL ;
- wxWindow *iter = (wxWindow*)this ;
+ wxWindowMac *iter = (wxWindowMac*)this ;
int totW = 10000 , totH = 10000;
while( iter )
@@ -2160,18 +2164,18 @@ void wxWindow::MacRepositionScrollBars()
}
}
-void wxWindow::MacKeyDown( EventRecord *ev )
+void wxWindowMac::MacKeyDown( EventRecord *ev )
{
}
-bool wxWindow::AcceptsFocus() const
+bool wxWindowMac::AcceptsFocus() const
{
return MacCanFocus() && wxWindowBase::AcceptsFocus();
}
-ControlHandle wxWindow::MacGetContainerForEmbedding()
+ControlHandle wxWindowMac::MacGetContainerForEmbedding()
{
if ( m_macWindowData )
return m_macWindowData->m_macRootControl ;
@@ -2179,20 +2183,20 @@ ControlHandle wxWindow::MacGetContainerForEmbedding()
return GetParent()->MacGetContainerForEmbedding() ;
}
-void wxWindow::MacSuperChangedPosition()
+void wxWindowMac::MacSuperChangedPosition()
{
// only window-absolute structures have to be moved i.e. controls
wxNode *node = GetChildren().First();
while ( node )
{
- wxWindow *child = (wxWindow *)node->Data();
+ wxWindowMac *child = (wxWindowMac *)node->Data();
child->MacSuperChangedPosition() ;
node = node->Next();
}
}
-bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win )
+bool wxWindowMac::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win )
{
if ( window == NULL )
return false ;
@@ -2210,7 +2214,7 @@ bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & cl
return true;
}
-bool wxWindow::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win )
+bool wxWindowMac::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win )
{
if ( window == NULL )
return false ;
@@ -2235,7 +2239,7 @@ bool wxWindow::MacSetPortDrawingParams( const Point & localOrigin, const Rect &
return true;
}
-void wxWindow::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin)
+void wxWindowMac::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin)
{
if ( m_macWindowData )
{
@@ -2265,7 +2269,7 @@ void wxWindow::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *w
}
}
-void wxWindow::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin )
+void wxWindowMac::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin )
{
// int width , height ;
// GetClientSize( &width , &height ) ;
@@ -2300,7 +2304,7 @@ void wxWindow::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, Wind
}
}
-void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin )
+void wxWindowMac::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin )
{
MacDoGetPortClientParams( localOrigin , clipRect , window , rootwin ) ;
@@ -2321,7 +2325,7 @@ void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, Window
SectRect(clipRect, &myClip, clipRect);
}
-long wxWindow::MacGetLeftBorderSize( ) const
+long wxWindowMac::MacGetLeftBorderSize( ) const
{
if( m_macWindowData )
return 0 ;
@@ -2341,7 +2345,7 @@ long wxWindow::MacGetLeftBorderSize( ) const
return 0 ;
}
-long wxWindow::MacGetRightBorderSize( ) const
+long wxWindowMac::MacGetRightBorderSize( ) const
{
if( m_macWindowData )
return 0 ;
@@ -2361,7 +2365,7 @@ long wxWindow::MacGetRightBorderSize( ) const
return 0 ;
}
-long wxWindow::MacGetTopBorderSize( ) const
+long wxWindowMac::MacGetTopBorderSize( ) const
{
if( m_macWindowData )
return 0 ;
@@ -2381,7 +2385,7 @@ long wxWindow::MacGetTopBorderSize( ) const
return 0 ;
}
-long wxWindow::MacGetBottomBorderSize( ) const
+long wxWindowMac::MacGetBottomBorderSize( ) const
{
if( m_macWindowData )
return 0 ;
@@ -2401,19 +2405,19 @@ long wxWindow::MacGetBottomBorderSize( ) const
return 0 ;
}
-long wxWindow::MacRemoveBordersFromStyle( long style )
+long wxWindowMac::MacRemoveBordersFromStyle( long style )
{
return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;
}
-wxMacDrawingHelper::wxMacDrawingHelper( wxWindow * theWindow )
+wxMacDrawingHelper::wxMacDrawingHelper( wxWindowMac * theWindow )
{
m_ok = false ;
Point localOrigin ;
Rect clipRect ;
WindowRef window ;
- wxWindow *rootwin ;
+ wxWindowMac *rootwin ;
m_currentPort = NULL ;
GetPort( &m_formerPort ) ;
@@ -2445,13 +2449,13 @@ wxMacDrawingHelper::~wxMacDrawingHelper()
SetPort( m_formerPort ) ;
}
-wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindow * theWindow )
+wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindowMac * theWindow )
{
m_ok = false ;
Point localOrigin ;
Rect clipRect ;
WindowRef window ;
- wxWindow *rootwin ;
+ wxWindowMac *rootwin ;
m_currentPort = NULL ;
GetPort( &m_formerPort ) ;
@@ -2484,12 +2488,12 @@ wxMacDrawingClientHelper::~wxMacDrawingClientHelper()
SetPort( m_formerPort ) ;
}
-// Find the wxWindow at the current mouse position, returning the mouse
+// Find the wxWindowMac at the current mouse position, returning the mouse
// position.
-wxWindow* wxFindWindowAtPointer(wxPoint& pt)
+wxWindowMac* wxFindWindowAtPointer(wxPoint& pt)
{
pt = wxGetMousePosition();
- wxWindow* found = wxFindWindowAtPoint(pt);
+ wxWindowMac* found = wxFindWindowAtPoint(pt);
return found;
}
diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp
index 8d97ce4889..99ee68a0fb 100644
--- a/src/mac/dcclient.cpp
+++ b/src/mac/dcclient.cpp
@@ -48,7 +48,7 @@ wxWindowDC::wxWindowDC()
wxWindowDC::wxWindowDC(wxWindow *the_canvas)
{
WindowRef windowref ;
- wxWindow* rootwindow ;
+ wxWindowMac* rootwindow ;
// this time it is really the full window
@@ -78,7 +78,7 @@ wxClientDC::wxClientDC()
wxClientDC::wxClientDC(wxWindow *window)
{
WindowRef windowref ;
- wxWindow* rootwindow ;
+ wxWindowMac* rootwindow ;
window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
m_macPort = UMAGetWindowPort( windowref ) ;
@@ -106,7 +106,7 @@ wxPaintDC::wxPaintDC()
wxPaintDC::wxPaintDC(wxWindow *window)
{
WindowRef windowref ;
- wxWindow* rootwindow ;
+ wxWindowMac* rootwindow ;
window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
diff --git a/src/mac/frame.cpp b/src/mac/frame.cpp
index bbbef8f74b..6bde00fc74 100644
--- a/src/mac/frame.cpp
+++ b/src/mac/frame.cpp
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: frame.cpp
-// Purpose: wxFrame
+// Purpose: wxFrameMac
// Author: AUTHOR
// Modified by:
// Created: ??/??/98
@@ -29,22 +29,25 @@ extern wxList wxModelessWindows;
extern wxList wxPendingDelete;
#if !USE_SHARED_LIBRARY
-BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
-// EVT_SIZE(wxFrame::OnSize)
- EVT_ACTIVATE(wxFrame::OnActivate)
- // EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
- EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
-// EVT_IDLE(wxFrame::OnIdle)
-// EVT_CLOSE(wxFrame::OnCloseWindow)
+BEGIN_EVENT_TABLE(wxFrameMac, wxFrameBase)
+// EVT_SIZE(wxFrameMac::OnSize)
+ EVT_ACTIVATE(wxFrameMac::OnActivate)
+ // EVT_MENU_HIGHLIGHT_ALL(wxFrameMac::OnMenuHighlight)
+ EVT_SYS_COLOUR_CHANGED(wxFrameMac::OnSysColourChanged)
+// EVT_IDLE(wxFrameMac::OnIdle)
+// EVT_CLOSE(wxFrameMac::OnCloseWindow)
END_EVENT_TABLE()
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxFrameMac, wxWindow)
+#endif
+#ifndef __WXUNIVERSAL__
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMac)
#endif
#if wxUSE_NATIVE_STATUSBAR
-bool wxFrame::m_useNativeStatusBar = TRUE;
+bool wxFrameMac::m_useNativeStatusBar = TRUE;
#else
-bool wxFrame::m_useNativeStatusBar = FALSE;
+bool wxFrameMac::m_useNativeStatusBar = FALSE;
#endif
#define WX_MAC_STATUSBAR_HEIGHT 15
@@ -52,7 +55,7 @@ bool wxFrame::m_useNativeStatusBar = FALSE;
// creation/destruction
// ----------------------------------------------------------------------------
-void wxFrame::Init()
+void wxFrameMac::Init()
{
m_frameMenuBar = NULL;
@@ -69,7 +72,7 @@ void wxFrame::Init()
#endif
}
-wxPoint wxFrame::GetClientAreaOrigin() const
+wxPoint wxFrameMac::GetClientAreaOrigin() const
{
// on mac we are at position -1,-1 with the control
wxPoint pt(0, 0);
@@ -94,7 +97,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
return pt;
}
-bool wxFrame::Create(wxWindow *parent,
+bool wxFrameMac::Create(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos,
@@ -123,7 +126,7 @@ bool wxFrame::Create(wxWindow *parent,
return TRUE;
}
-wxFrame::~wxFrame()
+wxFrameMac::~wxFrameMac()
{
m_isBeingDeleted = TRUE;
wxTopLevelWindows.DeleteObject(this);
@@ -146,7 +149,7 @@ wxFrame::~wxFrame()
}
-bool wxFrame::Enable(bool enable)
+bool wxFrameMac::Enable(bool enable)
{
if ( !wxWindow::Enable(enable) )
return FALSE;
@@ -162,40 +165,40 @@ bool wxFrame::Enable(bool enable)
return TRUE;
}
// Equivalent to maximize/restore in Windows
-void wxFrame::Maximize(bool maximize)
+void wxFrameMac::Maximize(bool maximize)
{
// TODO
}
-bool wxFrame::IsIconized() const
+bool wxFrameMac::IsIconized() const
{
// TODO
return FALSE;
}
-void wxFrame::Iconize(bool iconize)
+void wxFrameMac::Iconize(bool iconize)
{
// TODO
}
// Is the frame maximized?
-bool wxFrame::IsMaximized(void) const
+bool wxFrameMac::IsMaximized(void) const
{
// TODO
return FALSE;
}
-void wxFrame::Restore()
+void wxFrameMac::Restore()
{
// TODO
}
-void wxFrame::SetIcon(const wxIcon& icon)
+void wxFrameMac::SetIcon(const wxIcon& icon)
{
wxFrameBase::SetIcon(icon);
}
-wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
+wxStatusBar *wxFrameMac::OnCreateStatusBar(int number, long style, wxWindowID id,
const wxString& name)
{
wxStatusBar *statusBar = NULL;
@@ -207,7 +210,7 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
return statusBar;
}
-void wxFrame::PositionStatusBar()
+void wxFrameMac::PositionStatusBar()
{
if (m_frameStatusBar )
{
@@ -222,7 +225,7 @@ void wxFrame::PositionStatusBar()
}
}
-void wxFrame::SetMenuBar(wxMenuBar *menuBar)
+void wxFrameMac::SetMenuBar(wxMenuBar *menuBar)
{
if (!menuBar)
{
@@ -231,12 +234,12 @@ void wxFrame::SetMenuBar(wxMenuBar *menuBar)
m_frameMenuBar = menuBar;
// m_frameMenuBar->MacInstallMenuBar() ;
- m_frameMenuBar->Attach(this);
+ m_frameMenuBar->Attach((wxFrame *)this);
}
// Responds to colour changes, and passes event on to children.
-void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxFrameMac::OnSysColourChanged(wxSysColourChangedEvent& event)
{
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
Refresh();
@@ -255,7 +258,7 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
// Default activation behaviour - set the focus for the first child
// subwindow found.
-void wxFrame::OnActivate(wxActivateEvent& event)
+void wxFrameMac::OnActivate(wxActivateEvent& event)
{
if ( !event.GetActive() )
{
@@ -307,7 +310,7 @@ void wxFrame::OnActivate(wxActivateEvent& event)
}
}
-void wxFrame::DoGetClientSize(int *x, int *y) const
+void wxFrameMac::DoGetClientSize(int *x, int *y) const
{
wxWindow::DoGetClientSize( x , y ) ;
@@ -325,7 +328,7 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
*x -= pt.x;
}
-void wxFrame::DoSetClientSize(int clientwidth, int clientheight)
+void wxFrameMac::DoSetClientSize(int clientwidth, int clientheight)
{
int currentclientwidth , currentclientheight ;
int currentwidth , currentheight ;
@@ -345,7 +348,7 @@ void wxFrame::DoSetClientSize(int clientwidth, int clientheight)
#if wxUSE_TOOLBAR
-wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
+wxToolBar* wxFrameMac::CreateToolBar(long style, wxWindowID id, const wxString& name)
{
if ( wxFrameBase::CreateToolBar(style, id, name) )
{
@@ -355,7 +358,7 @@ wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& nam
return m_frameToolBar;
}
-void wxFrame::PositionToolBar()
+void wxFrameMac::PositionToolBar()
{
int cw, ch;
diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index 78d6f24710..35f8c0ef6d 100644
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: windows.cpp
-// Purpose: wxWindow
+// Purpose: wxWindowMac
// Author: AUTHOR
// Modified by:
// Created: ??/??/98
@@ -54,16 +54,16 @@
#include <string.h>
extern wxList wxPendingDelete;
-wxWindow* gFocusWindow = NULL ;
+wxWindowMac* gFocusWindow = NULL ;
#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
-BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
- EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
- EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
- EVT_INIT_DIALOG(wxWindow::OnInitDialog)
- EVT_IDLE(wxWindow::OnIdle)
- EVT_SET_FOCUS(wxWindow::OnSetFocus)
+IMPLEMENT_DYNAMIC_CLASS(wxWindowMac, wxEvtHandler)
+BEGIN_EVENT_TABLE(wxWindowMac, wxEvtHandler)
+ EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
+ EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged)
+ EVT_INIT_DIALOG(wxWindowMac::OnInitDialog)
+ EVT_IDLE(wxWindowMac::OnIdle)
+ EVT_SET_FOCUS(wxWindowMac::OnSetFocus)
END_EVENT_TABLE()
#endif
@@ -75,21 +75,21 @@ END_EVENT_TABLE()
// ===========================================================================
// ---------------------------------------------------------------------------
-// wxWindow utility functions
+// wxWindowMac utility functions
// ---------------------------------------------------------------------------
// Find an item given the Macintosh Window Reference
wxList *wxWinMacWindowList = NULL;
-wxWindow *wxFindWinFromMacWindow(WindowRef inWindowRef)
+wxWindowMac *wxFindWinFromMacWindow(WindowRef inWindowRef)
{
wxNode *node = wxWinMacWindowList->Find((long)inWindowRef);
if (!node)
return NULL;
- return (wxWindow *)node->Data();
+ return (wxWindowMac *)node->Data();
}
-void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindow *win)
+void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindowMac *win)
{
// adding NULL WindowRef is (first) surely a result of an error and
// (secondly) breaks menu command processing
@@ -99,7 +99,7 @@ void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindow *win)
wxWinMacWindowList->Append((long)inWindowRef, win);
}
-void wxRemoveMacWindowAssociation(wxWindow *win)
+void wxRemoveMacWindowAssociation(wxWindowMac *win)
{
wxWinMacWindowList->DeleteObject(win);
}
@@ -108,9 +108,9 @@ void wxRemoveMacWindowAssociation(wxWindow *win)
// constructors and such
// ----------------------------------------------------------------------------
-WindowRef wxWindow::s_macWindowInUpdate = NULL;
+WindowRef wxWindowMac::s_macWindowInUpdate = NULL;
-void wxWindow::Init()
+void wxWindowMac::Init()
{
// generic
InitBase();
@@ -150,11 +150,11 @@ void wxWindow::Init()
}
// Destructor
-wxWindow::~wxWindow()
+wxWindowMac::~wxWindowMac()
{
// deleting a window while it is shown invalidates the region
if ( IsShown() ) {
- wxWindow* iter = this ;
+ wxWindowMac* iter = this ;
while( iter ) {
if ( iter->m_macWindowData )
{
@@ -193,13 +193,13 @@ wxWindow::~wxWindow()
}
// Constructor
-bool wxWindow::Create(wxWindow *parent, wxWindowID id,
+bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style,
const wxString& name)
{
- wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") );
+ wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindowMac without parent") );
if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
return FALSE;
@@ -211,16 +211,16 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
AdjustForParentClientOrigin(m_x, m_y, wxSIZE_USE_EXISTING);
m_width = WidthDefault( size.x );
m_height = HeightDefault( size.y ) ;
-
+#ifndef __WXUNIVERSAL__
if ( ! IsKindOf( CLASSINFO ( wxControl ) ) && ! IsKindOf( CLASSINFO( wxStatusBar ) ) )
{
MacCreateScrollBars( style ) ;
}
-
+#endif
return TRUE;
}
-void wxWindow::SetFocus()
+void wxWindowMac::SetFocus()
{
if ( gFocusWindow == this )
return ;
@@ -236,12 +236,14 @@ void wxWindow::SetFocus()
gFocusWindow->m_caret->OnKillFocus();
}
#endif // wxUSE_CARET
+ #ifndef __WXUNIVERSAL__
wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
if ( control && control->GetMacControl() )
{
UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl() , kControlFocusNoPart ) ;
control->MacRedrawControl() ;
}
+ #endif
wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId);
event.SetEventObject(gFocusWindow);
gFocusWindow->GetEventHandler()->ProcessEvent(event) ;
@@ -259,14 +261,15 @@ void wxWindow::SetFocus()
wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
if ( panel )
{
- panel->SetLastFocus(this);
+ panel->SetLastFocus((wxWindow*)this);
}
+ #ifndef __WXUNIVERSAL__
wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
if ( control && control->GetMacControl() )
{
UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl() , kControlEditTextPart ) ;
}
-
+ #endif
wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event) ;
@@ -274,7 +277,7 @@ void wxWindow::SetFocus()
}
}
-bool wxWindow::Enable(bool enable)
+bool wxWindowMac::Enable(bool enable)
{
if ( !wxWindowBase::Enable(enable) )
return FALSE;
@@ -282,7 +285,7 @@ bool wxWindow::Enable(bool enable)
wxWindowList::Node *node = GetChildren().GetFirst();
while ( node )
{
- wxWindow *child = node->GetData();
+ wxWindowMac *child = node->GetData();
child->Enable(enable);
node = node->GetNext();
@@ -291,7 +294,7 @@ bool wxWindow::Enable(bool enable)
return TRUE;
}
-void wxWindow::CaptureMouse()
+void wxWindowMac::CaptureMouse()
{
wxTheApp->s_captureWindow = this ;
}
@@ -301,14 +304,14 @@ wxWindow* wxWindowBase::GetCapture()
return wxTheApp->s_captureWindow ;
}
-void wxWindow::ReleaseMouse()
+void wxWindowMac::ReleaseMouse()
{
wxTheApp->s_captureWindow = NULL ;
}
#if wxUSE_DRAG_AND_DROP
-void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
+void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
{
if ( m_pDropTarget != 0 ) {
delete m_pDropTarget;
@@ -324,19 +327,19 @@ void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
#endif
// Old style file-manager drag&drop
-void wxWindow::DragAcceptFiles(bool accept)
+void wxWindowMac::DragAcceptFiles(bool accept)
{
// TODO
}
// Get total size
-void wxWindow::DoGetSize(int *x, int *y) const
+void wxWindowMac::DoGetSize(int *x, int *y) const
{
*x = m_width ;
*y = m_height ;
}
-void wxWindow::DoGetPosition(int *x, int *y) const
+void wxWindowMac::DoGetPosition(int *x, int *y) const
{
*x = m_x ;
*y = m_y ;
@@ -348,8 +351,8 @@ void wxWindow::DoGetPosition(int *x, int *y) const
}
}
-
-bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
+#if wxUSE_MENUS
+bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
{
menu->SetInvokingWindow(this);
menu->UpdateUI();
@@ -363,8 +366,9 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
return TRUE;
}
+#endif
-void wxWindow::DoScreenToClient(int *x, int *y) const
+void wxWindowMac::DoScreenToClient(int *x, int *y) const
{
WindowRef window = GetMacRootWindow() ;
@@ -384,7 +388,7 @@ void wxWindow::DoScreenToClient(int *x, int *y) const
MacRootWindowToClient( x , y ) ;
}
-void wxWindow::DoClientToScreen(int *x, int *y) const
+void wxWindowMac::DoClientToScreen(int *x, int *y) const
{
WindowRef window = GetMacRootWindow() ;
@@ -404,7 +408,7 @@ void wxWindow::DoClientToScreen(int *x, int *y) const
*y = localwhere.v ;
}
-void wxWindow::MacClientToRootWindow( int *x , int *y ) const
+void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const
{
if ( m_macWindowData )
{
@@ -417,7 +421,7 @@ void wxWindow::MacClientToRootWindow( int *x , int *y ) const
}
}
-void wxWindow::MacRootWindowToClient( int *x , int *y ) const
+void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const
{
if ( m_macWindowData )
{
@@ -430,7 +434,7 @@ void wxWindow::MacRootWindowToClient( int *x , int *y ) const
}
}
-bool wxWindow::SetCursor(const wxCursor& cursor)
+bool wxWindowMac::SetCursor(const wxCursor& cursor)
{
if (m_cursor == cursor)
return FALSE;
@@ -450,7 +454,7 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
wxT("cursor must be valid after call to the base version"));
Point pt ;
- wxWindow *mouseWin ;
+ wxWindowMac *mouseWin ;
GetMouse( &pt ) ;
// Change the cursor NOW if we're within the correct window
@@ -468,7 +472,7 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
// Get size *available for subwindows* i.e. excluding menu bar etc.
-void wxWindow::DoGetClientSize(int *x, int *y) const
+void wxWindowMac::DoGetClientSize(int *x, int *y) const
{
*x = m_width ;
*y = m_height ;
@@ -487,7 +491,7 @@ void wxWindow::DoGetClientSize(int *x, int *y) const
MacClientToRootWindow( &w , &h ) ;
WindowRef window = NULL ;
- wxWindow *iter = (wxWindow*)this ;
+ wxWindowMac *iter = (wxWindowMac*)this ;
int totW = 10000 , totH = 10000;
while( iter )
@@ -528,7 +532,7 @@ void wxWindow::DoGetClientSize(int *x, int *y) const
#if wxUSE_TOOLTIPS
-void wxWindow::DoSetToolTip(wxToolTip *tooltip)
+void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
{
wxWindowBase::DoSetToolTip(tooltip);
@@ -538,7 +542,7 @@ void wxWindow::DoSetToolTip(wxToolTip *tooltip)
#endif // wxUSE_TOOLTIPS
-void wxWindow::DoMoveWindow(int x, int y, int width, int height)
+void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
{
DoSetSize( x,y, width, height ) ;
}
@@ -551,7 +555,7 @@ void wxWindow::DoMoveWindow(int x, int y, int width, int height)
// If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate
// the width/height to best suit our contents, otherwise we reuse the current
// width/height
-void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int former_x = m_x ;
@@ -689,7 +693,7 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
}
if ( doMove )
- wxWindow::MacSuperChangedPosition() ; // like this only children will be notified
+ wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
}
MacRepositionScrollBars() ;
if ( doMove )
@@ -712,14 +716,14 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
// For implementation purposes - sometimes decorations make the client area
// smaller
-wxPoint wxWindow::GetClientAreaOrigin() const
+wxPoint wxWindowMac::GetClientAreaOrigin() const
{
return wxPoint(MacGetLeftBorderSize( ) , MacGetTopBorderSize( ) );
}
// Makes an adjustment to the window position (for example, a frame that has
// a toolbar that it manages itself).
-void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
+void wxWindowMac::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
{
if( !m_macWindowData )
{
@@ -731,7 +735,7 @@ void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
}
}
-void wxWindow::SetTitle(const wxString& title)
+void wxWindowMac::SetTitle(const wxString& title)
{
m_label = title ;
@@ -746,12 +750,12 @@ void wxWindow::SetTitle(const wxString& title)
UMASetWTitleC( m_macWindowData->m_macWindow , label ) ;
}
-wxString wxWindow::GetTitle() const
+wxString wxWindowMac::GetTitle() const
{
return m_label ;
}
-bool wxWindow::Show(bool show)
+bool wxWindowMac::Show(bool show)
{
if ( !wxWindowBase::Show(show) )
return FALSE;
@@ -778,7 +782,7 @@ bool wxWindow::Show(bool show)
if ( !show )
{
WindowRef window = GetMacRootWindow() ;
- wxWindow* win = wxFindWinFromMacWindow( window ) ;
+ wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
if ( !win->m_isBeingDeleted )
Refresh() ;
}
@@ -790,19 +794,19 @@ bool wxWindow::Show(bool show)
return TRUE;
}
-void wxWindow::MacSuperShown( bool show )
+void wxWindowMac::MacSuperShown( bool show )
{
wxNode *node = GetChildren().First();
while ( node )
{
- wxWindow *child = (wxWindow *)node->Data();
+ wxWindowMac *child = (wxWindowMac *)node->Data();
if ( child->m_isShown )
child->MacSuperShown( show ) ;
node = node->Next();
}
}
-bool wxWindow::MacIsReallyShown() const
+bool wxWindowMac::MacIsReallyShown() const
{
if ( m_isShown && (m_parent != NULL) ) {
return m_parent->MacIsReallyShown();
@@ -810,7 +814,7 @@ bool wxWindow::MacIsReallyShown() const
return m_isShown;
/*
bool status = m_isShown ;
- wxWindow * win = this ;
+ wxWindowMac * win = this ;
while ( status && win->m_parent != NULL )
{
win = win->m_parent ;
@@ -820,26 +824,26 @@ bool wxWindow::MacIsReallyShown() const
*/
}
-int wxWindow::GetCharHeight() const
+int wxWindowMac::GetCharHeight() const
{
- wxClientDC dc ( (wxWindow*)this ) ;
+ wxClientDC dc ( (wxWindowMac*)this ) ;
return dc.GetCharHeight() ;
}
-int wxWindow::GetCharWidth() const
+int wxWindowMac::GetCharWidth() const
{
- wxClientDC dc ( (wxWindow*)this ) ;
+ wxClientDC dc ( (wxWindowMac*)this ) ;
return dc.GetCharWidth() ;
}
-void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
+void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,
int *descent, int *externalLeading, const wxFont *theFont ) const
{
const wxFont *fontToUse = theFont;
if ( !fontToUse )
fontToUse = &m_font;
- wxClientDC dc( (wxWindow*) this ) ;
+ wxClientDC dc( (wxWindowMac*) this ) ;
long lx,ly,ld,le ;
dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
if ( externalLeading )
@@ -852,7 +856,7 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
*y = ly ;
}
-void wxWindow::MacEraseBackground( Rect *rect )
+void wxWindowMac::MacEraseBackground( Rect *rect )
{
/*
WindowRef window = GetMacRootWindow() ;
@@ -866,7 +870,7 @@ void wxWindow::MacEraseBackground( Rect *rect )
// it is on a notebook panel or not, in order to take care of that we walk up the hierarchy until we have
// either a non gray background color or a non control window
- wxWindow* parent = GetParent() ;
+ wxWindowMac* parent = GetParent() ;
while( parent )
{
if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) )
@@ -907,7 +911,7 @@ void wxWindow::MacEraseBackground( Rect *rect )
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
- wxWindow *child = (wxWindow*)node->Data();
+ wxWindowMac *child = (wxWindowMac*)node->Data();
Rect clientrect = { child->m_x , child->m_y , child->m_x +child->m_width , child->m_y + child->m_height } ;
SectRect( &clientrect , rect , &clientrect ) ;
@@ -925,7 +929,7 @@ void wxWindow::MacEraseBackground( Rect *rect )
*/
}
-void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
+void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
{
// if ( !IsShown() )
// return ;
@@ -952,13 +956,13 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
}
// Responds to colour changes: passes event on to children.
-void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxWindowMac::OnSysColourChanged(wxSysColourChangedEvent& event)
{
wxNode *node = GetChildren().First();
while ( node )
{
// Only propagate to non-top-level windows
- wxWindow *win = (wxWindow *)node->Data();
+ wxWindowMac *win = (wxWindowMac *)node->Data();
if ( win->GetParent() )
{
wxSysColourChangedEvent event2;
@@ -975,36 +979,36 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
// Caret manipulation
// ---------------------------------------------------------------------------
-void wxWindow::CreateCaret(int w, int h)
+void wxWindowMac::CreateCaret(int w, int h)
{
SetCaret(new wxCaret(this, w, h));
}
-void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
+void wxWindowMac::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
{
wxFAIL_MSG("not implemented");
}
-void wxWindow::ShowCaret(bool show)
+void wxWindowMac::ShowCaret(bool show)
{
wxCHECK_RET( m_caret, "no caret to show" );
m_caret->Show(show);
}
-void wxWindow::DestroyCaret()
+void wxWindowMac::DestroyCaret()
{
SetCaret(NULL);
}
-void wxWindow::SetCaretPos(int x, int y)
+void wxWindowMac::SetCaretPos(int x, int y)
{
wxCHECK_RET( m_caret, "no caret to move" );
m_caret->Move(x, y);
}
-void wxWindow::GetCaretPos(int *x, int *y) const
+void wxWindowMac::GetCaretPos(int *x, int *y) const
{
wxCHECK_RET( m_caret, "no caret to get position of" );
@@ -1012,24 +1016,24 @@ void wxWindow::GetCaretPos(int *x, int *y) const
}
#endif // wxUSE_CARET
-wxWindow *wxGetActiveWindow()
+wxWindowMac *wxGetActiveWindow()
{
// actually this is a windows-only concept
return NULL;
}
// Coordinates relative to the window
-void wxWindow::WarpPointer (int x_pos, int y_pos)
+void wxWindowMac::WarpPointer (int x_pos, int y_pos)
{
// We really dont move the mouse programmatically under mac
}
-void wxWindow::OnEraseBackground(wxEraseEvent& event)
+void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
{
// TODO : probably we would adopt the EraseEvent structure
}
-int wxWindow::GetScrollPos(int orient) const
+int wxWindowMac::GetScrollPos(int orient) const
{
if ( orient == wxHORIZONTAL )
{
@@ -1046,7 +1050,7 @@ int wxWindow::GetScrollPos(int orient) const
// This now returns the whole range, not just the number
// of positions that we can scroll.
-int wxWindow::GetScrollRange(int orient) const
+int wxWindowMac::GetScrollRange(int orient) const
{
if ( orient == wxHORIZONTAL )
{
@@ -1061,7 +1065,7 @@ int wxWindow::GetScrollRange(int orient) const
return 0;
}
-int wxWindow::GetScrollThumb(int orient) const
+int wxWindowMac::GetScrollThumb(int orient) const
{
if ( orient == wxHORIZONTAL )
{
@@ -1076,7 +1080,7 @@ int wxWindow::GetScrollThumb(int orient) const
return 0;
}
-void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
+void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh)
{
if ( orient == wxHORIZONTAL )
{
@@ -1090,7 +1094,7 @@ void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
}
}
-void wxWindow::MacCreateRealWindow( const wxString& title,
+void wxWindowMac::MacCreateRealWindow( const wxString& title,
const wxPoint& pos,
const wxSize& size,
long style,
@@ -1179,11 +1183,11 @@ void wxWindow::MacCreateRealWindow( const wxString& title,
m_macWindowData->m_macHasReceivedFirstActivate = true ;
}
-void wxWindow::MacPaint( wxPaintEvent &event )
+void wxWindowMac::MacPaint( wxPaintEvent &event )
{
}
-void wxWindow::MacPaintBorders( )
+void wxWindowMac::MacPaintBorders( )
{
if( m_macWindowData )
return ;
@@ -1297,7 +1301,7 @@ void wxWindow::MacPaintBorders( )
}
// New function that will replace some of the above.
-void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
+void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
int range, bool refresh)
{
if ( orient == wxHORIZONTAL )
@@ -1338,7 +1342,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
}
// Does a physical scroll
-void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
+void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
{
wxMacDrawingClientHelper focus( this ) ;
if ( focus.Ok() )
@@ -1362,7 +1366,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
- wxWindow *child = (wxWindow*)node->Data();
+ wxWindowMac *child = (wxWindowMac*)node->Data();
if (child == m_vScrollBar) continue;
if (child == m_hScrollBar) continue;
if (child->IsTopLevel()) continue;
@@ -1375,7 +1379,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
}
-void wxWindow::MacOnScroll(wxScrollEvent &event )
+void wxWindowMac::MacOnScroll(wxScrollEvent &event )
{
if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar )
{
@@ -1410,7 +1414,7 @@ void wxWindow::MacOnScroll(wxScrollEvent &event )
}
}
-bool wxWindow::SetFont(const wxFont& font)
+bool wxWindowMac::SetFont(const wxFont& font)
{
if ( !wxWindowBase::SetFont(font) )
{
@@ -1422,7 +1426,7 @@ bool wxWindow::SetFont(const wxFont& font)
}
// Get the window with the focus
-wxWindow *wxWindowBase::FindFocus()
+wxWindowMac *wxWindowBase::FindFocus()
{
return gFocusWindow ;
}
@@ -1431,7 +1435,7 @@ wxWindow *wxWindowBase::FindFocus()
// If nothing defined for this, try the parent.
// E.g. we may be a button loaded from a resource, with no callback function
// defined.
-void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event)
+void wxWindowMac::OnCommand(wxWindowMac& win, wxCommandEvent& event)
{
if ( GetEventHandler()->ProcessEvent(event) )
return;
@@ -1441,7 +1445,7 @@ void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event)
#endif // WXWIN_COMPATIBILITY_2
#if WXWIN_COMPATIBILITY
-wxObject* wxWindow::GetChild(int number) const
+wxObject* wxWindowMac::GetChild(int number) const
{
// Return a pointer to the Nth object in the Panel
wxNode *node = GetChildren().First();
@@ -1458,7 +1462,7 @@ wxObject* wxWindow::GetChild(int number) const
}
#endif // WXWIN_COMPATIBILITY
-void wxWindow::OnSetFocus(wxFocusEvent& event)
+void wxWindowMac::OnSetFocus(wxFocusEvent& event)
{
// panel wants to track the window which was the last to have focus in it,
// so we want to set ourselves as the window which last had focus
@@ -1466,10 +1470,10 @@ void wxWindow::OnSetFocus(wxFocusEvent& event)
// notice that it's also important to do it upwards the tree becaus
// otherwise when the top level panel gets focus, it won't set it back to
// us, but to some other sibling
- wxWindow *win = this;
+ wxWindowMac *win = this;
while ( win )
{
- wxWindow *parent = win->GetParent();
+ wxWindowMac *parent = win->GetParent();
wxPanel *panel = wxDynamicCast(parent, wxPanel);
if ( panel )
{
@@ -1482,7 +1486,7 @@ void wxWindow::OnSetFocus(wxFocusEvent& event)
event.Skip();
}
-void wxWindow::Clear()
+void wxWindowMac::Clear()
{
if ( m_macWindowData )
{
@@ -1504,13 +1508,13 @@ void wxWindow::Clear()
}
// Setup background and foreground colours correctly
-void wxWindow::SetupColours()
+void wxWindowMac::SetupColours()
{
if ( GetParent() )
SetBackgroundColour(GetParent()->GetBackgroundColour());
}
-void wxWindow::OnIdle(wxIdleEvent& event)
+void wxWindowMac::OnIdle(wxIdleEvent& event)
{
/*
// Check if we need to send a LEAVE event
@@ -1533,7 +1537,7 @@ void wxWindow::OnIdle(wxIdleEvent& event)
}
// Raise the window to the top of the Z order
-void wxWindow::Raise()
+void wxWindowMac::Raise()
{
if ( m_macWindowData )
{
@@ -1542,7 +1546,7 @@ void wxWindow::Raise()
}
// Lower the window to the bottom of the Z order
-void wxWindow::Lower()
+void wxWindowMac::Lower()
{
if ( m_macWindowData )
{
@@ -1550,7 +1554,7 @@ void wxWindow::Lower()
}
}
-void wxWindow::DoSetClientSize(int width, int height)
+void wxWindowMac::DoSetClientSize(int width, int height)
{
if ( width != -1 || height != -1 )
{
@@ -1568,9 +1572,9 @@ void wxWindow::DoSetClientSize(int width, int height)
}
-wxWindow* wxWindow::s_lastMouseWindow = NULL ;
+wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ;
-bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWin )
+bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin )
{
if ((point.x < m_x) || (point.y < m_y) ||
(point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
@@ -1585,7 +1589,7 @@ bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWi
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
- wxWindow *child = (wxWindow*)node->Data();
+ wxWindowMac *child = (wxWindowMac*)node->Data();
// added the m_isShown test --dmazzoni
if ( child->GetMacRootWindow() == window && child->m_isShown )
{
@@ -1598,14 +1602,14 @@ bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWi
return TRUE;
}
-bool wxWindow::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindow** outWin )
+bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin )
{
WindowRef window ;
Point pt = { screenpoint.y , screenpoint.x } ;
if ( ::FindWindow( pt , &window ) == 3 )
{
wxPoint point( screenpoint ) ;
- wxWindow* win = wxFindWinFromMacWindow( window ) ;
+ wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
if ( win )
{
win->ScreenToClient( point ) ;
@@ -1617,7 +1621,7 @@ bool wxWindow::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindow** ou
extern int wxBusyCursorCount ;
-bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event)
+bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
{
if ((event.m_x < m_x) || (event.m_y < m_y) ||
(event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
@@ -1637,7 +1641,7 @@ bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event)
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
- wxWindow *child = (wxWindow*)node->Data();
+ wxWindowMac *child = (wxWindowMac*)node->Data();
if ( child->GetMacRootWindow() == window && child->IsShown() && child->IsEnabled() )
{
if (child->MacDispatchMouseEvent(event))
@@ -1673,7 +1677,7 @@ bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event)
Point lastWhere ;
long lastWhen = 0 ;
-wxString wxWindow::MacGetToolTipString( wxPoint &pt )
+wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
{
if ( m_tooltip )
{
@@ -1681,7 +1685,7 @@ wxString wxWindow::MacGetToolTipString( wxPoint &pt )
}
return "" ;
}
-void wxWindow::MacFireMouseEvent( EventRecord *ev )
+void wxWindowMac::MacFireMouseEvent( EventRecord *ev )
{
wxMouseEvent event(wxEVT_LEFT_DOWN);
bool isDown = !(ev->modifiers & btnState) ; // 1 is for up
@@ -1780,12 +1784,12 @@ void wxWindow::MacFireMouseEvent( EventRecord *ev )
}
}
-void wxWindow::MacMouseDown( EventRecord *ev , short part)
+void wxWindowMac::MacMouseDown( EventRecord *ev , short part)
{
MacFireMouseEvent( ev ) ;
}
-void wxWindow::MacMouseUp( EventRecord *ev , short part)
+void wxWindowMac::MacMouseUp( EventRecord *ev , short part)
{
WindowPtr frontWindow ;
switch (part)
@@ -1798,7 +1802,7 @@ void wxWindow::MacMouseUp( EventRecord *ev , short part)
}
}
-void wxWindow::MacMouseMoved( EventRecord *ev , short part)
+void wxWindowMac::MacMouseMoved( EventRecord *ev , short part)
{
WindowPtr frontWindow ;
switch (part)
@@ -1810,7 +1814,7 @@ void wxWindow::MacMouseMoved( EventRecord *ev , short part)
break ;
}
}
-void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating )
+void wxWindowMac::MacActivate( EventRecord *ev , bool inIsActivating )
{
if ( !m_macWindowData->m_macHasReceivedFirstActivate )
m_macWindowData->m_macHasReceivedFirstActivate = true ;
@@ -1826,14 +1830,14 @@ void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating )
// MacUpdateImmediately() ;
}
-void wxWindow::MacRedraw( RgnHandle updatergn , long time)
+void wxWindowMac::MacRedraw( RgnHandle updatergn , long time)
{
// updatergn is always already clipped to our boundaries
WindowRef window = GetMacRootWindow() ;
// ownUpdateRgn is the area that this window has to invalidate i.e. its own area without its children
RgnHandle ownUpdateRgn = NewRgn() ;
CopyRgn( updatergn , ownUpdateRgn ) ;
- wxWindow* win = wxFindWinFromMacWindow( window ) ;
+ wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
{
wxMacDrawingHelper focus( this ) ; // was client
if ( focus.Ok() )
@@ -1853,7 +1857,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
// either a non gray background color or a non control window
- wxWindow* parent = GetParent() ;
+ wxWindowMac* parent = GetParent() ;
while( parent )
{
if ( parent->GetMacRootWindow() != window )
@@ -1902,7 +1906,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
RgnHandle childarea = NewRgn() ;
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
- wxWindow *child = (wxWindow*)node->Data();
+ wxWindowMac *child = (wxWindowMac*)node->Data();
// eventually test for transparent windows
if ( child->GetMacRootWindow() == window && child->IsShown() )
{
@@ -1953,7 +1957,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
- wxWindow *child = (wxWindow*)node->Data();
+ wxWindowMac *child = (wxWindowMac*)node->Data();
SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ;
SectRgn( childupdate , updatergn , childupdate ) ;
OffsetRgn( childupdate , -child->m_x , -child->m_y ) ;
@@ -1967,12 +1971,12 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
// eventually a draw grow box here
}
-void wxWindow::MacUpdateImmediately()
+void wxWindowMac::MacUpdateImmediately()
{
WindowRef window = GetMacRootWindow() ;
if ( window )
{
- wxWindow* win = wxFindWinFromMacWindow( window ) ;
+ wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
#if TARGET_CARBON
AGAPortHelper help( GetWindowPort(window) ) ;
#else
@@ -2000,10 +2004,10 @@ void wxWindow::MacUpdateImmediately()
}
}
-void wxWindow::MacUpdate( EventRecord *ev )
+void wxWindowMac::MacUpdate( EventRecord *ev )
{
WindowRef window = (WindowRef) ev->message ;
- wxWindow * win = wxFindWinFromMacWindow( window ) ;
+ wxWindowMac * win = wxFindWinFromMacWindow( window ) ;
#if TARGET_CARBON
AGAPortHelper help( GetWindowPort(window) ) ;
#else
@@ -2030,10 +2034,10 @@ void wxWindow::MacUpdate( EventRecord *ev )
EndUpdate( window ) ;
}
-WindowRef wxWindow::GetMacRootWindow() const
+WindowRef wxWindowMac::GetMacRootWindow() const
{
WindowRef window = NULL ;
- wxWindow *iter = (wxWindow*)this ;
+ wxWindowMac *iter = (wxWindowMac*)this ;
while( iter )
{
@@ -2046,7 +2050,7 @@ WindowRef wxWindow::GetMacRootWindow() const
return NULL ;
}
-void wxWindow::MacCreateScrollBars( long style )
+void wxWindowMac::MacCreateScrollBars( long style )
{
wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ;
@@ -2085,7 +2089,7 @@ void wxWindow::MacCreateScrollBars( long style )
MacRepositionScrollBars() ; // we might have a real position shift
}
-void wxWindow::MacRepositionScrollBars()
+void wxWindowMac::MacRepositionScrollBars()
{
bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;
@@ -2112,7 +2116,7 @@ void wxWindow::MacRepositionScrollBars()
MacClientToRootWindow( &w , &h ) ;
WindowRef window = NULL ;
- wxWindow *iter = (wxWindow*)this ;
+ wxWindowMac *iter = (wxWindowMac*)this ;
int totW = 10000 , totH = 10000;
while( iter )
@@ -2160,18 +2164,18 @@ void wxWindow::MacRepositionScrollBars()
}
}
-void wxWindow::MacKeyDown( EventRecord *ev )
+void wxWindowMac::MacKeyDown( EventRecord *ev )
{
}
-bool wxWindow::AcceptsFocus() const
+bool wxWindowMac::AcceptsFocus() const
{
return MacCanFocus() && wxWindowBase::AcceptsFocus();
}
-ControlHandle wxWindow::MacGetContainerForEmbedding()
+ControlHandle wxWindowMac::MacGetContainerForEmbedding()
{
if ( m_macWindowData )
return m_macWindowData->m_macRootControl ;
@@ -2179,20 +2183,20 @@ ControlHandle wxWindow::MacGetContainerForEmbedding()
return GetParent()->MacGetContainerForEmbedding() ;
}
-void wxWindow::MacSuperChangedPosition()
+void wxWindowMac::MacSuperChangedPosition()
{
// only window-absolute structures have to be moved i.e. controls
wxNode *node = GetChildren().First();
while ( node )
{
- wxWindow *child = (wxWindow *)node->Data();
+ wxWindowMac *child = (wxWindowMac *)node->Data();
child->MacSuperChangedPosition() ;
node = node->Next();
}
}
-bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win )
+bool wxWindowMac::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win )
{
if ( window == NULL )
return false ;
@@ -2210,7 +2214,7 @@ bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & cl
return true;
}
-bool wxWindow::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win )
+bool wxWindowMac::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win )
{
if ( window == NULL )
return false ;
@@ -2235,7 +2239,7 @@ bool wxWindow::MacSetPortDrawingParams( const Point & localOrigin, const Rect &
return true;
}
-void wxWindow::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin)
+void wxWindowMac::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin)
{
if ( m_macWindowData )
{
@@ -2265,7 +2269,7 @@ void wxWindow::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *w
}
}
-void wxWindow::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin )
+void wxWindowMac::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin )
{
// int width , height ;
// GetClientSize( &width , &height ) ;
@@ -2300,7 +2304,7 @@ void wxWindow::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, Wind
}
}
-void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin )
+void wxWindowMac::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin )
{
MacDoGetPortClientParams( localOrigin , clipRect , window , rootwin ) ;
@@ -2321,7 +2325,7 @@ void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, Window
SectRect(clipRect, &myClip, clipRect);
}
-long wxWindow::MacGetLeftBorderSize( ) const
+long wxWindowMac::MacGetLeftBorderSize( ) const
{
if( m_macWindowData )
return 0 ;
@@ -2341,7 +2345,7 @@ long wxWindow::MacGetLeftBorderSize( ) const
return 0 ;
}
-long wxWindow::MacGetRightBorderSize( ) const
+long wxWindowMac::MacGetRightBorderSize( ) const
{
if( m_macWindowData )
return 0 ;
@@ -2361,7 +2365,7 @@ long wxWindow::MacGetRightBorderSize( ) const
return 0 ;
}
-long wxWindow::MacGetTopBorderSize( ) const
+long wxWindowMac::MacGetTopBorderSize( ) const
{
if( m_macWindowData )
return 0 ;
@@ -2381,7 +2385,7 @@ long wxWindow::MacGetTopBorderSize( ) const
return 0 ;
}
-long wxWindow::MacGetBottomBorderSize( ) const
+long wxWindowMac::MacGetBottomBorderSize( ) const
{
if( m_macWindowData )
return 0 ;
@@ -2401,19 +2405,19 @@ long wxWindow::MacGetBottomBorderSize( ) const
return 0 ;
}
-long wxWindow::MacRemoveBordersFromStyle( long style )
+long wxWindowMac::MacRemoveBordersFromStyle( long style )
{
return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;
}
-wxMacDrawingHelper::wxMacDrawingHelper( wxWindow * theWindow )
+wxMacDrawingHelper::wxMacDrawingHelper( wxWindowMac * theWindow )
{
m_ok = false ;
Point localOrigin ;
Rect clipRect ;
WindowRef window ;
- wxWindow *rootwin ;
+ wxWindowMac *rootwin ;
m_currentPort = NULL ;
GetPort( &m_formerPort ) ;
@@ -2445,13 +2449,13 @@ wxMacDrawingHelper::~wxMacDrawingHelper()
SetPort( m_formerPort ) ;
}
-wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindow * theWindow )
+wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindowMac * theWindow )
{
m_ok = false ;
Point localOrigin ;
Rect clipRect ;
WindowRef window ;
- wxWindow *rootwin ;
+ wxWindowMac *rootwin ;
m_currentPort = NULL ;
GetPort( &m_formerPort ) ;
@@ -2484,12 +2488,12 @@ wxMacDrawingClientHelper::~wxMacDrawingClientHelper()
SetPort( m_formerPort ) ;
}
-// Find the wxWindow at the current mouse position, returning the mouse
+// Find the wxWindowMac at the current mouse position, returning the mouse
// position.
-wxWindow* wxFindWindowAtPointer(wxPoint& pt)
+wxWindowMac* wxFindWindowAtPointer(wxPoint& pt)
{
pt = wxGetMousePosition();
- wxWindow* found = wxFindWindowAtPoint(pt);
+ wxWindowMac* found = wxFindWindowAtPoint(pt);
return found;
}
diff --git a/src/makemac6.mcp b/src/makemac6.mcp
index 2859b9bd1f..8237f15732 100644
Binary files a/src/makemac6.mcp and b/src/makemac6.mcp differ
diff --git a/src/png/makemac.mcp b/src/png/makemac.mcp
index 5d841bccfc..5645e5bd24 100644
Binary files a/src/png/makemac.mcp and b/src/png/makemac.mcp differ
diff --git a/src/tiff/makemac.mcp b/src/tiff/makemac.mcp
index 54d532698a..400af56e88 100644
Binary files a/src/tiff/makemac.mcp and b/src/tiff/makemac.mcp differ
diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index fdd0927bf6..546f714ef4 100644
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -75,13 +75,21 @@ void wxFrame::OnSize(wxSizeEvent& event)
{
#if wxUSE_MENUS
PositionMenuBar();
+<<<<<<< framuniv.cpp
+#endif
+=======
#endif // wxUSE_WAVE
+>>>>>>> 1.4
event.Skip();
}
+<<<<<<< framuniv.cpp
+#if wxUSE_MENUS
+=======
#if wxUSE_MENUS
+>>>>>>> 1.4
void wxFrame::PositionMenuBar()
{
if ( m_frameMenuBar )
@@ -92,9 +100,14 @@ void wxFrame::PositionMenuBar()
GetClientSize().x, -1);
}
}
+<<<<<<< framuniv.cpp
+#endif // wxUSE_MENUS
+
+=======
#endif // wxUSE_MENUS
+>>>>>>> 1.4
wxPoint wxFrame::GetClientAreaOrigin() const
{
wxPoint pt = wxFrameNative::GetClientAreaOrigin();
diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp
index 131d81a17a..9ef37e16d1 100644
--- a/src/univ/themes/gtk.cpp
+++ b/src/univ/themes/gtk.cpp
@@ -186,6 +186,7 @@ public:
// we don't have the ticks in GTK version
}
+#if wxUSE_MENUS
virtual void DrawMenuBarItem(wxDC& dc,
const wxRect& rect,
const wxString& label,
@@ -202,7 +203,7 @@ public:
virtual void DrawMenuSeparator(wxDC& dc,
wxCoord y,
const wxMenuGeometryInfo& geomInfo);
-
+#endif
virtual void GetComboBitmaps(wxBitmap *bmpNormal,
wxBitmap *bmpPressed,
wxBitmap *bmpDisabled);
@@ -248,11 +249,12 @@ public:
virtual wxSize GetSliderThumbSize(const wxRect& rect,
wxOrientation orient) const;
virtual wxSize GetProgressBarStep() const { return wxSize(16, 32); }
+#if wxUSE_MENUS
virtual wxSize GetMenuBarItemSize(const wxSize& sizeText) const;
virtual wxMenuGeometryInfo *GetMenuGeometry(wxWindow *win,
const wxMenu& menu) const;
-
+#endif
// helpers for "wxBitmap wxColourScheme::Get()"
void DrawCheckBitmap(wxDC& dc, const wxRect& rect);
void DrawUncheckBitmap(wxDC& dc, const wxRect& rect, bool isPressed);
@@ -1745,6 +1747,7 @@ void wxGTKRenderer::DrawSliderThumb(wxDC& dc,
DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);
}
+#if wxUSE_MENUS
// ----------------------------------------------------------------------------
// menu and menubar
// ----------------------------------------------------------------------------
@@ -1789,7 +1792,7 @@ wxMenuGeometryInfo *wxGTKRenderer::GetMenuGeometry(wxWindow *win,
return NULL;
}
-
+#endif
// ----------------------------------------------------------------------------
// combobox
// ----------------------------------------------------------------------------
diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index ecd9ec5a97..68178a25e3 100644
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -236,6 +236,7 @@ public:
int end,
int step = 1,
int flags = 0);
+#if wxUSE_MENUS
virtual void DrawMenuBarItem(wxDC& dc,
const wxRect& rect,
@@ -253,7 +254,7 @@ public:
virtual void DrawMenuSeparator(wxDC& dc,
wxCoord y,
const wxMenuGeometryInfo& geomInfo);
-
+#endif
virtual void GetComboBitmaps(wxBitmap *bmpNormal,
wxBitmap *bmpPressed,
wxBitmap *bmpDisabled);
@@ -299,10 +300,11 @@ public:
wxOrientation orient) const;
virtual wxSize GetProgressBarStep() const { return wxSize(16, 32); }
+#if wxUSE_MENUS
virtual wxSize GetMenuBarItemSize(const wxSize& sizeText) const;
virtual wxMenuGeometryInfo *GetMenuGeometry(wxWindow *win,
const wxMenu& menu) const;
-
+#endif
protected:
// helper of DrawLabel() and DrawCheckOrRadioButton()
void DoDrawLabel(wxDC& dc,
@@ -2408,6 +2410,7 @@ void wxWin32Renderer::DrawSliderTicks(wxDC& dc,
DrawLine(dc, x2, y1, x2, y2, orient == wxVERTICAL);
}
+#if wxUSE_MENUS
// ----------------------------------------------------------------------------
// menu and menubar
// ----------------------------------------------------------------------------
@@ -2677,6 +2680,9 @@ wxMenuGeometryInfo *wxWin32Renderer::GetMenuGeometry(wxWindow *win,
return gi;
}
+<<<<<<< win32.cpp
+#endif
+=======
#else // !wxUSE_MENUS
@@ -2719,6 +2725,7 @@ wxWin32Renderer::GetMenuGeometry(wxWindow *WXUNUSED(win),
#endif // wxUSE_MENUS/!wxUSE_MENUS
+>>>>>>> 1.5
// ----------------------------------------------------------------------------
// combobox
// ----------------------------------------------------------------------------
diff --git a/src/zlib/makemac.mcp b/src/zlib/makemac.mcp
index 99a1766456..49ff8b9e83 100644
Binary files a/src/zlib/makemac.mcp and b/src/zlib/makemac.mcp differ