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

fixing file paths after renaming

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2008-06-11 19:17:41 +00:00
parent 8dd7fd4e5d
commit ef0e92205a
170 changed files with 260 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/accel.h
View File

@ -157,7 +157,7 @@ private:
#elif defined(__WXGTK__)
#include "wx/gtk1/accel.h"
#elif defined(__WXMAC__)
#include "wx/mac/accel.h"
#include "wx/osx/accel.h"
#elif defined(__WXCOCOA__)
#include "wx/generic/accel.h"
#elif defined(__WXPM__)

2
include/wx/app.h
View File

@ -596,7 +596,7 @@ protected:
#elif defined(__WXX11__)
#include "wx/x11/app.h"
#elif defined(__WXMAC__)
#include "wx/mac/app.h"
#include "wx/osx/app.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/app.h"
#elif defined(__WXPM__)

2
include/wx/bitmap.h
View File

@ -243,7 +243,7 @@ protected:
#elif defined(__WXDFB__)
#include "wx/dfb/bitmap.h"
#elif defined(__WXMAC__)
#include "wx/mac/bitmap.h"
#include "wx/osx/bitmap.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/bitmap.h"
#elif defined(__WXPM__)

2
include/wx/bmpbuttn.h
View File

@ -110,7 +110,7 @@ inline void wxBitmapButtonBase::SetLabel(const wxBitmap& bitmap)
#elif defined(__WXGTK__)
#include "wx/gtk1/bmpbuttn.h"
#elif defined(__WXMAC__)
#include "wx/mac/bmpbuttn.h"
#include "wx/osx/bmpbuttn.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/bmpbuttn.h"
#elif defined(__WXPM__)

2
include/wx/brush.h
View File

@ -77,7 +77,7 @@ public:
#elif defined(__WXDFB__)
#include "wx/dfb/brush.h"
#elif defined(__WXMAC__)
#include "wx/mac/brush.h"
#include "wx/osx/brush.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/brush.h"
#elif defined(__WXPM__)

2
include/wx/button.h
View File

@ -95,7 +95,7 @@ protected:
#elif defined(__WXGTK__)
#include "wx/gtk1/button.h"
#elif defined(__WXMAC__)
#include "wx/mac/button.h"
#include "wx/osx/button.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/button.h"
#elif defined(__WXPM__)

2
include/wx/checkbox.h
View File

@ -144,7 +144,7 @@ private:
#elif defined(__WXGTK__)
#include "wx/gtk1/checkbox.h"
#elif defined(__WXMAC__)
#include "wx/mac/checkbox.h"
#include "wx/osx/checkbox.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/checkbox.h"
#elif defined(__WXPM__)

2
include/wx/checklst.h
View File

@ -51,7 +51,7 @@ public:
#elif defined(__WXGTK__)
#include "wx/gtk1/checklst.h"
#elif defined(__WXMAC__)
#include "wx/mac/checklst.h"
#include "wx/osx/checklst.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/checklst.h"
#elif defined(__WXPM__)

2
include/wx/chkconf.h
View File

@ -1023,7 +1023,7 @@
#elif defined(__WXGTK__)
# include "wx/gtk/chkconf.h"
#elif defined(__WXMAC__)
# include "wx/mac/chkconf.h"
# include "wx/osx/chkconf.h"
#elif defined(__OS2__)
# include "wx/os2/chkconf.h"
#elif defined(__WXMGL__)

2
include/wx/choice.h
View File

@ -79,7 +79,7 @@ private:
#elif defined(__WXGTK__)
#include "wx/gtk1/choice.h"
#elif defined(__WXMAC__)
#include "wx/mac/choice.h"
#include "wx/osx/choice.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/choice.h"
#elif defined(__WXPM__)

2
include/wx/clipbrd.h
View File

@ -118,7 +118,7 @@ public:
#elif defined(__WXMGL__)
#include "wx/mgl/clipbrd.h"
#elif defined(__WXMAC__)
#include "wx/mac/clipbrd.h"
#include "wx/osx/clipbrd.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/clipbrd.h"
#elif defined(__WXPM__)

2
include/wx/cocoa/ObjcRef.h
View File

@ -13,7 +13,7 @@
#define _WX_COCOA_OBJCREF_H__
// Reuse wxCFRef-related code (e.g. wxCFRetain/wxCFRelease)
#include "wx/mac/corefoundation/cfref.h"
#include "wx/osx/core/cfref.h"
// NOTE WELL: We can only know whether or not GC can be used when compiling Objective-C.
// Therefore we cannot implement these functions except when compiling Objective-C.

2
include/wx/cocoa/app.h
View File

@ -15,7 +15,7 @@
typedef struct __CFRunLoopObserver * CFRunLoopObserverRef;
typedef const struct __CFString * CFStringRef;
#include "wx/mac/corefoundation/cfref.h"
#include "wx/osx/core/cfref.h"
// ========================================================================
// wxApp

1
include/wx/cocoa/colour.h
View File

@ -38,6 +38,7 @@ public:
// accessors
virtual bool IsOk() const { return m_cocoaNSColor; }
WX_NSColor GetNSColor() { return m_cocoaNSColor; }
WX_NSColor GetNSColor() const { return m_cocoaNSColor; }
unsigned char Red() const { return m_red; }
unsigned char Green() const { return m_green; }

2
include/wx/colordlg.h
View File

@ -19,7 +19,7 @@
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
#include "wx/msw/colordlg.h"
#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
#include "wx/mac/colordlg.h"
#include "wx/osx/colordlg.h"
#elif defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
#include "wx/gtk/colordlg.h"
#elif defined(__WXPALMOS__)

2
include/wx/colour.h
View File

@ -189,7 +189,7 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxColourBase* col);
#elif defined(__WXX11__)
#include "wx/x11/colour.h"
#elif defined(__WXMAC__)
#include "wx/mac/colour.h"
#include "wx/osx/colour.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/colour.h"
#elif defined(__WXPM__)

2
include/wx/combobox.h
View File

@ -68,7 +68,7 @@ public:
#elif defined(__WXGTK__)
#include "wx/gtk1/combobox.h"
#elif defined(__WXMAC__)
#include "wx/mac/combobox.h"
#include "wx/osx/combobox.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/combobox.h"
#elif defined(__WXPM__)

2
include/wx/control.h
View File

@ -131,7 +131,7 @@ protected:
#elif defined(__WXGTK__)
#include "wx/gtk1/control.h"
#elif defined(__WXMAC__)
#include "wx/mac/control.h"
#include "wx/osx/control.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/control.h"
#elif defined(__WXPM__)

2
include/wx/cursor.h
View File

@ -31,7 +31,7 @@
#elif defined(__WXDFB__)
#include "wx/dfb/cursor.h"
#elif defined(__WXMAC__)
#include "wx/mac/cursor.h"
#include "wx/osx/cursor.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/cursor.h"
#elif defined(__WXPM__)

6
include/wx/dataobj.h
View File

@ -83,7 +83,7 @@ public:
#elif defined(__WXX11__)
#include "wx/x11/dataform.h"
#elif defined(__WXMAC__)
#include "wx/mac/dataform.h"
#include "wx/osx/dataform.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/dataform.h"
#elif defined(__WXPM__)
@ -171,7 +171,7 @@ public:
#elif defined(__WXGTK__)
#include "wx/gtk1/dataobj.h"
#elif defined(__WXMAC__)
#include "wx/mac/dataobj.h"
#include "wx/osx/dataobj.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/dataobj.h"
#elif defined(__WXPM__)
@ -515,7 +515,7 @@ private:
#elif defined(__WXMOTIF__)
#include "wx/motif/dataobj2.h"
#elif defined(__WXMAC__)
#include "wx/mac/dataobj2.h"
#include "wx/osx/dataobj2.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/dataobj2.h"
#elif defined(__WXPM__)

2
include/wx/dataview.h
View File

@ -861,7 +861,7 @@ typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
#elif defined(__WXGTK20__)
#include "wx/gtk/dataview.h"
#elif defined(__WXMAC__)
#include "wx/mac/dataview.h"
#include "wx/osx/dataview.h"
#else
#include "wx/generic/dataview.h"
#endif

2
include/wx/dialog.h
View File

@ -314,7 +314,7 @@ public:
#elif defined(__WXGTK__)
#include "wx/gtk1/dialog.h"
#elif defined(__WXMAC__)
#include "wx/mac/dialog.h"
#include "wx/osx/dialog.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/dialog.h"
#elif defined(__WXPM__)

2
include/wx/dirdlg.h
View File

@ -111,7 +111,7 @@ protected:
#include "wx/generic/dirdlgg.h"
#define wxDirDialog wxGenericDirDialog
#elif defined(__WXMAC__)
#include "wx/mac/dirdlg.h" // Native Mac
#include "wx/osx/dirdlg.h" // Native Mac
#elif defined(__WXCOCOA__)
#include "wx/cocoa/dirdlg.h" // Native Cocoa
#elif defined(__WXMOTIF__) || \

2
include/wx/dnd.h
View File

@ -222,7 +222,7 @@ protected:
#elif defined(__WXGTK__)
#include "wx/gtk1/dnd.h"
#elif defined(__WXMAC__)
#include "wx/mac/dnd.h"
#include "wx/osx/dnd.h"
#elif defined(__WXPM__)
#include "wx/os2/dnd.h"
#endif

2
include/wx/evtloop.h
View File

@ -116,7 +116,7 @@ protected:
#elif defined(__WXMSW__)
#include "wx/msw/evtloop.h"
#elif defined(__WXMAC__)
#include "wx/mac/evtloop.h"
#include "wx/osx/evtloop.h"
#elif defined(__WXDFB__)
#include "wx/dfb/evtloop.h"
#else // other platform

2
include/wx/filedlg.h
View File

@ -218,7 +218,7 @@ wxSaveFileSelector(const wxString& what,
#elif defined(__WXGTK__)
#include "wx/gtk1/filedlg.h"
#elif defined(__WXMAC__)
#include "wx/mac/filedlg.h"
#include "wx/osx/filedlg.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/filedlg.h"
#elif defined(__WXPM__)

2
include/wx/font.h
View File

@ -243,7 +243,7 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font);
#elif defined(__WXDFB__)
#include "wx/dfb/font.h"
#elif defined(__WXMAC__)
#include "wx/mac/font.h"
#include "wx/osx/font.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/font.h"
#elif defined(__WXPM__)

2
include/wx/fontdlg.h
View File

@ -99,7 +99,7 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
#elif defined(__WXPM__)
#include "wx/os2/fontdlg.h"
#elif defined(__WXMAC__)
#include "wx/mac/fontdlg.h"
#include "wx/osx/fontdlg.h"
#endif
// ----------------------------------------------------------------------------

2
include/wx/frame.h
View File

@ -263,7 +263,7 @@ protected:
#elif defined(__WXMOTIF__)
#include "wx/motif/frame.h"
#elif defined(__WXMAC__)
#include "wx/mac/frame.h"
#include "wx/osx/frame.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/frame.h"
#elif defined(__WXPM__)

2
include/wx/gauge.h
View File

@ -114,7 +114,7 @@ protected:
#elif defined(__WXGTK__)
#include "wx/gtk1/gauge.h"
#elif defined(__WXMAC__)
#include "wx/mac/gauge.h"
#include "wx/osx/gauge.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/gauge.h"
#elif defined(__WXPM__)

2
include/wx/glcanvas.h
View File

@ -191,7 +191,7 @@ public:
#elif defined(__WXGTK__)
#include "wx/gtk1/glcanvas.h"
#elif defined(__WXMAC__)
#include "wx/mac/glcanvas.h"
#include "wx/osx/glcanvas.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/glcanvas.h"
#else

2
include/wx/icon.h
View File

@ -32,7 +32,7 @@
#elif defined(__WXDFB__)
#include "wx/generic/icon.h"
#elif defined(__WXMAC__)
#include "wx/mac/icon.h"
#include "wx/osx/icon.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/icon.h"
#elif defined(__WXPM__)

2
include/wx/imaglist.h
View File

@ -49,7 +49,7 @@ enum
#elif defined(__WXMSW__)
#include "wx/msw/imaglist.h"
#elif defined(__WXMAC__)
#include "wx/mac/imaglist.h"
#include "wx/osx/imaglist.h"
#elif defined(__WXPALMOS__)
#include "wx/palmos/imaglist.h"
#endif

4
include/wx/joystick.h
View File

@ -25,9 +25,9 @@
#elif defined(__WXX11__)
#include "wx/unix/joystick.h"
#elif defined(__DARWIN__)
#include "wx/mac/corefoundation/joystick.h"
#include "wx/osx/core/joystick.h"
#elif defined(__WXMAC__)
#include "wx/mac/joystick.h"
#include "wx/osx/joystick.h"
#elif defined(__WXPM__)
#include "wx/os2/joystick.h"
#endif

2
include/wx/listbox.h
View File

@ -127,7 +127,7 @@ private:
#elif defined(__WXGTK__)
#include "wx/gtk1/listbox.h"
#elif defined(__WXMAC__)
#include "wx/mac/listbox.h"
#include "wx/osx/listbox.h"
#elif defined(__WXPM__)
#include "wx/os2/listbox.h"
#elif defined(__WXCOCOA__)

2
include/wx/listctrl.h
View File

@ -31,7 +31,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[];
#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
#include "wx/msw/listctrl.h"
#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
#include "wx/mac/carbon/listctrl.h"
#include "wx/osx/carbon/listctrl.h"
#else
#include "wx/generic/listctrl.h"
#endif

2
include/wx/mdi.h
View File

@ -27,7 +27,7 @@
#elif defined(__WXGTK__)
#include "wx/gtk1/mdi.h"
#elif defined(__WXMAC__)
#include "wx/mac/mdi.h"
#include "wx/osx/mdi.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/mdi.h"
#elif defined(__WXPM__)

2
include/wx/menu.h
View File

@ -532,7 +532,7 @@ protected:
#elif defined(__WXGTK__)
#include "wx/gtk1/menu.h"
#elif defined(__WXMAC__)
#include "wx/mac/menu.h"
#include "wx/osx/menu.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/menu.h"
#elif defined(__WXPM__)

2
include/wx/menuitem.h
View File

@ -200,7 +200,7 @@ inline void wxMenuItemBase::SetText(const wxString& text) { SetItemLabel(text);
#elif defined(__WXGTK__)
#include "wx/gtk1/menuitem.h"
#elif defined(__WXMAC__)
#include "wx/mac/menuitem.h"
#include "wx/osx/menuitem.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/menuitem.h"
#elif defined(__WXPM__)

2
include/wx/metafile.h
View File

@ -54,7 +54,7 @@
#elif defined(__WXPM__)
#include "wx/os2/metafile.h"
#elif defined(__WXMAC__)
#include "wx/mac/metafile.h"
#include "wx/osx/metafile.h"
#endif
#endif // wxUSE_METAFILE

2
include/wx/minifram.h
View File

@ -29,7 +29,7 @@
#elif defined(__WXX11__)
#include "wx/x11/minifram.h"
#elif defined(__WXMAC__)
#include "wx/mac/minifram.h"
#include "wx/osx/minifram.h"
#elif defined(__WXPM__)
#include "wx/os2/minifram.h"
#else

2
include/wx/msgdlg.h
View File

@ -126,7 +126,7 @@ protected:
#elif defined(__WXGTK20__)
#include "wx/gtk/msgdlg.h"
#elif defined(__WXMAC__)
#include "wx/mac/msgdlg.h"
#include "wx/osx/msgdlg.h"
#elif defined(__WXPM__)
#include "wx/os2/msgdlg.h"
#endif

2
include/wx/nonownedwnd.h
View File

@ -15,7 +15,7 @@
#if defined(__WXDFB__)
#include "wx/dfb/nonownedwnd.h"
#elif defined(__WXMAC__)
#include "wx/mac/nonownedwnd.h"
#include "wx/osx/nonownedwnd.h"
#else
// other ports can derive both wxTLW and wxPopupWindow directly
// from wxWindow:

2
include/wx/notebook.h
View File

@ -167,7 +167,7 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
#elif defined(__WXGTK__)
#include "wx/gtk1/notebook.h"
#elif defined(__WXMAC__)
#include "wx/mac/notebook.h"
#include "wx/osx/notebook.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/notebook.h"
#elif defined(__WXPM__)

4
include/wx/osx/accel.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/accel.h"
#include "wx/osx/classic/accel.h"
#else
#include "wx/mac/carbon/accel.h"
#include "wx/osx/carbon/accel.h"
#endif

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

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/app.h"
#include "wx/osx/classic/app.h"
#else
#include "wx/mac/carbon/app.h"
#include "wx/osx/carbon/app.h"
#endif

4
include/wx/osx/bitmap.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/bitmap.h"
#include "wx/osx/classic/bitmap.h"
#else
#include "wx/mac/carbon/bitmap.h"
#include "wx/osx/carbon/bitmap.h"
#endif

4
include/wx/osx/bmpbuttn.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/bmpbuttn.h"
#include "wx/osx/classic/bmpbuttn.h"
#else
#include "wx/mac/carbon/bmpbuttn.h"
#include "wx/osx/carbon/bmpbuttn.h"
#endif

4
include/wx/osx/brush.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/brush.h"
#include "wx/osx/classic/brush.h"
#else
#include "wx/mac/carbon/brush.h"
#include "wx/osx/carbon/brush.h"
#endif

4
include/wx/osx/button.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/button.h"
#include "wx/osx/classic/button.h"
#else
#include "wx/mac/carbon/button.h"
#include "wx/osx/carbon/button.h"
#endif

2
include/wx/osx/carbon/clipbrd.h
View File

@ -21,7 +21,7 @@
#include "wx/module.h"
#include "wx/dataobj.h" // for wxDataFormat
#include "wx/mac/corefoundation/cfref.h"
#include "wx/osx/core/cfref.h"
//-----------------------------------------------------------------------------
// wxClipboard

2
include/wx/osx/carbon/colour.h
View File

@ -15,7 +15,7 @@
#include "wx/object.h"
#include "wx/string.h"
#include "wx/mac/corefoundation/cfref.h"
#include "wx/osx/core/cfref.h"
struct RGBColor;

2
include/wx/osx/carbon/databrow.h
View File

@ -16,7 +16,7 @@
#if wxUSE_GUI
#include "wx/mac/private.h"
#include "wx/osx/private.h"
WX_DEFINE_ARRAY_SIZE_T(size_t,wxArrayDataBrowserItemID);

2
include/wx/osx/carbon/dcmemory.h
View File

@ -12,7 +12,7 @@
#ifndef _WX_DCMEMORY_H_
#define _WX_DCMEMORY_H_
#include "wx/mac/carbon/dcclient.h"
#include "wx/osx/carbon/dcclient.h"
class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPaintDCImpl
{

2
include/wx/osx/carbon/dcscreen.h
View File

@ -13,7 +13,7 @@
#define _WX_DCSCREEN_H_
#include "wx/dcclient.h"
#include "wx/mac/carbon/dcclient.h"
#include "wx/osx/carbon/dcclient.h"
class WXDLLIMPEXP_CORE wxScreenDCImpl: public wxWindowDCImpl
{

2
include/wx/osx/carbon/metafile.h
View File

@ -22,7 +22,7 @@
#include "wx/dataobj.h"
#endif
#include "wx/mac/carbon/dcclient.h"
#include "wx/osx/carbon/dcclient.h"
/*
* Metafile and metafile device context classes

10
include/wx/osx/carbon/private.h
View File

@ -18,8 +18,8 @@
#include <Carbon/Carbon.h>
#include "wx/mac/corefoundation/cfstring.h"
#include "wx/mac/corefoundation/cfdataref.h"
#include "wx/osx/core/cfstring.h"
#include "wx/osx/core/cfdataref.h"
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
typedef UInt32 URefCon;
@ -29,9 +29,9 @@ typedef SInt32 SRefCon;
#if wxUSE_GUI
#include "wx/listbox.h"
#include "wx/mac/carbon/dc.h"
#include "wx/mac/carbon/dcclient.h"
#include "wx/mac/carbon/dcmemory.h"
#include "wx/osx/carbon/dc.h"
#include "wx/osx/carbon/dcclient.h"
#include "wx/osx/carbon/dcmemory.h"
class WXDLLIMPEXP_CORE wxMacCGContextStateSaver
{

2
include/wx/osx/carbon/private/mactext.h
View File

@ -12,7 +12,7 @@
#ifndef _WX_MAC_PRIVATE_MACTEXT_H_
#define _WX_MAC_PRIVATE_MACTEXT_H_
#include "wx/mac/private.h"
#include "wx/osx/private.h"
// common interface for all implementations
class wxMacTextControl : public wxMacControl

2
include/wx/osx/carbon/private/overlay.h
View File

@ -12,7 +12,7 @@
#ifndef _WX_MAC_CARBON_PRIVATE_OVERLAY_H_
#define _WX_MAC_CARBON_PRIVATE_OVERLAY_H_
#include "wx/mac/private.h"
#include "wx/osx/private.h"
#include "wx/toplevel.h"
#include "wx/graphics.h"

2
include/wx/osx/carbon/uma.h
View File

@ -12,7 +12,7 @@
#ifndef H_UMA
#define H_UMA
#include "wx/mac/private.h"
#include "wx/osx/private.h"
void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded) ;
long UMAGetSystemVersion() ;

4
include/wx/osx/checkbox.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/checkbox.h"
#include "wx/osx/classic/checkbox.h"
#else
#include "wx/mac/carbon/checkbox.h"
#include "wx/osx/carbon/checkbox.h"
#endif

4
include/wx/osx/checklst.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/checklst.h"
#include "wx/osx/classic/checklst.h"
#else
#include "wx/mac/carbon/checklst.h"
#include "wx/osx/carbon/checklst.h"
#endif

4
include/wx/osx/chkconf.h
View File

@ -28,7 +28,7 @@
#endif /* wxUSE_STACKWALKER */
#ifdef __WXMAC_CLASSIC__
# include "wx/mac/classic/chkconf.h"
# include "wx/osx/classic/chkconf.h"
#else
# include "wx/mac/carbon/chkconf.h"
# include "wx/osx/carbon/chkconf.h"
#endif

4
include/wx/osx/choice.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/choice.h"
#include "wx/osx/classic/choice.h"
#else
#include "wx/mac/carbon/choice.h"
#include "wx/osx/carbon/choice.h"
#endif

4
include/wx/osx/clipbrd.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/clipbrd.h"
#include "wx/osx/classic/clipbrd.h"
#else
#include "wx/mac/carbon/clipbrd.h"
#include "wx/osx/carbon/clipbrd.h"
#endif

4
include/wx/osx/colordlg.h
View File

@ -1,6 +1,6 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/colordlg.h"
#include "wx/osx/classic/colordlg.h"
#else
#include "wx/mac/carbon/colordlg.h"
#include "wx/osx/carbon/colordlg.h"
#endif

4
include/wx/osx/colour.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/colour.h"
#include "wx/osx/classic/colour.h"
#else
#include "wx/mac/carbon/colour.h"
#include "wx/osx/carbon/colour.h"
#endif

4
include/wx/osx/combobox.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/combobox.h"
#include "wx/osx/classic/combobox.h"
#else
#include "wx/mac/carbon/combobox.h"
#include "wx/osx/carbon/combobox.h"
#endif

4
include/wx/osx/control.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/control.h"
#include "wx/osx/classic/control.h"
#else
#include "wx/mac/carbon/control.h"
#include "wx/osx/carbon/control.h"
#endif

2
include/wx/osx/core/cfdataref.h
View File

@ -16,7 +16,7 @@
#ifndef _WX_MAC_COREFOUNDATION_CFDATAREF_H__
#define _WX_MAC_COREFOUNDATION_CFDATAREF_H__
#include "wx/mac/corefoundation/cfref.h"
#include "wx/osx/core/cfref.h"
#include <CoreFoundation/CFData.h>

2
include/wx/osx/core/cfstring.h
View File

@ -17,7 +17,7 @@
#include "wx/dlimpexp.h"
#include "wx/fontenc.h"
#include "wx/mac/corefoundation/cfref.h"
#include "wx/osx/core/cfref.h"
class WXDLLIMPEXP_FWD_BASE wxString;

4
include/wx/osx/core/private.h
View File

@ -18,8 +18,8 @@
#include <CoreFoundation/CoreFoundation.h>
#include "wx/mac/corefoundation/cfstring.h"
#include "wx/mac/corefoundation/cfdataref.h"
#include "wx/osx/core/cfstring.h"
#include "wx/osx/core/cfdataref.h"
#if wxUSE_GUI

4
include/wx/osx/cursor.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/cursor.h"
#include "wx/osx/classic/cursor.h"
#else
#include "wx/mac/carbon/cursor.h"
#include "wx/osx/carbon/cursor.h"
#endif

4
include/wx/osx/dataform.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/dataform.h"
#include "wx/osx/classic/dataform.h"
#else
#include "wx/mac/carbon/dataform.h"
#include "wx/osx/carbon/dataform.h"
#endif

4
include/wx/osx/dataobj.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/dataobj.h"
#include "wx/osx/classic/dataobj.h"
#else
#include "wx/mac/carbon/dataobj.h"
#include "wx/osx/carbon/dataobj.h"
#endif

4
include/wx/osx/dataobj2.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/dataobj2.h"
#include "wx/osx/classic/dataobj2.h"
#else
#include "wx/mac/carbon/dataobj2.h"
#include "wx/osx/carbon/dataobj2.h"
#endif

2
include/wx/osx/dataview.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
# error "Native wxDataViewCtrl for classic environment not defined. Please use generic control."
#else
# include "wx/mac/carbon/dataview.h"
# include "wx/osx/carbon/dataview.h"
#endif

4
include/wx/osx/dc.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/dc.h"
#include "wx/osx/classic/dc.h"
#else
#include "wx/mac/carbon/dc.h"
#include "wx/osx/carbon/dc.h"
#endif

4
include/wx/osx/dcclient.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/dcclient.h"
#include "wx/osx/classic/dcclient.h"
#else
#include "wx/mac/carbon/dcclient.h"
#include "wx/osx/carbon/dcclient.h"
#endif

4
include/wx/osx/dcmemory.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/dcmemory.h"
#include "wx/osx/classic/dcmemory.h"
#else
#include "wx/mac/carbon/dcmemory.h"
#include "wx/osx/carbon/dcmemory.h"
#endif

4
include/wx/osx/dcprint.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/dcprint.h"
#include "wx/osx/classic/dcprint.h"
#else
#include "wx/mac/carbon/dcprint.h"
#include "wx/osx/carbon/dcprint.h"
#endif

4
include/wx/osx/dcscreen.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/dcscreen.h"
#include "wx/osx/classic/dcscreen.h"
#else
#include "wx/mac/carbon/dcscreen.h"
#include "wx/osx/carbon/dcscreen.h"
#endif

4
include/wx/osx/dialog.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/dialog.h"
#include "wx/osx/classic/dialog.h"
#else
#include "wx/mac/carbon/dialog.h"
#include "wx/osx/carbon/dialog.h"
#endif

4
include/wx/osx/dirdlg.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/dirdlg.h"
#include "wx/osx/classic/dirdlg.h"
#else
#include "wx/mac/carbon/dirdlg.h"
#include "wx/osx/carbon/dirdlg.h"
#endif

4
include/wx/osx/dnd.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/dnd.h"
#include "wx/osx/classic/dnd.h"
#else
#include "wx/mac/carbon/dnd.h"
#include "wx/osx/carbon/dnd.h"
#endif

2
include/wx/osx/evtloop.h
View File

@ -13,6 +13,6 @@
#ifdef __WXMAC_CLASSIC__
#error "wxEventLoop is not implemented for Classic build."
#else
#include "wx/mac/carbon/evtloop.h"
#include "wx/osx/carbon/evtloop.h"
#endif

4
include/wx/osx/filedlg.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/filedlg.h"
#include "wx/osx/classic/filedlg.h"
#else
#include "wx/mac/carbon/filedlg.h"
#include "wx/osx/carbon/filedlg.h"
#endif

4
include/wx/osx/font.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/font.h"
#include "wx/osx/classic/font.h"
#else
#include "wx/mac/carbon/font.h"
#include "wx/osx/carbon/font.h"
#endif

4
include/wx/osx/fontdlg.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/fontdlg.h"
#include "wx/osx/classic/fontdlg.h"
#else
#include "wx/mac/carbon/fontdlg.h"
#include "wx/osx/carbon/fontdlg.h"
#endif

4
include/wx/osx/frame.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/frame.h"
#include "wx/osx/classic/frame.h"
#else
#include "wx/mac/carbon/frame.h"
#include "wx/osx/carbon/frame.h"
#endif

4
include/wx/osx/gauge.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/gauge.h"
#include "wx/osx/classic/gauge.h"
#else
#include "wx/mac/carbon/gauge.h"
#include "wx/osx/carbon/gauge.h"
#endif

4
include/wx/osx/glcanvas.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/glcanvas.h"
#include "wx/osx/classic/glcanvas.h"
#else
#include "wx/mac/carbon/glcanvas.h"
#include "wx/osx/carbon/glcanvas.h"
#endif

4
include/wx/osx/helpxxxx.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/helpxxxx.h"
#include "wx/osx/classic/helpxxxx.h"
#else
#include "wx/mac/carbon/helpxxxx.h"
#include "wx/osx/carbon/helpxxxx.h"
#endif

4
include/wx/osx/icon.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/icon.h"
#include "wx/osx/classic/icon.h"
#else
#include "wx/mac/carbon/icon.h"
#include "wx/osx/carbon/icon.h"
#endif

4
include/wx/osx/imaglist.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/imaglist.h"
#include "wx/osx/classic/imaglist.h"
#else
#include "wx/mac/carbon/imaglist.h"
#include "wx/osx/carbon/imaglist.h"
#endif

4
include/wx/osx/joystick.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/joystick.h"
#include "wx/osx/classic/joystick.h"
#else
#include "wx/mac/carbon/joystick.h"
#include "wx/osx/carbon/joystick.h"
#endif

4
include/wx/osx/listbox.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/listbox.h"
#include "wx/osx/classic/listbox.h"
#else
#include "wx/mac/carbon/listbox.h"
#include "wx/osx/carbon/listbox.h"
#endif

4
include/wx/osx/listctrl.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/listctrl.h"
#include "wx/osx/classic/listctrl.h"
#else
#include "wx/mac/carbon/listctrl.h"
#include "wx/osx/carbon/listctrl.h"
#endif

4
include/wx/osx/mdi.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/mdi.h"
#include "wx/osx/classic/mdi.h"
#else
#include "wx/mac/carbon/mdi.h"
#include "wx/osx/carbon/mdi.h"
#endif

4
include/wx/osx/menu.h
View File

@ -1,5 +1,5 @@
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/menu.h"
#include "wx/osx/classic/menu.h"
#else
#include "wx/mac/carbon/menu.h"
#include "wx/osx/carbon/menu.h"
#endif

Some files were not shown because too many files have changed in this diff Show More