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

fixed cases where __WXMAC_CLASSIC__, __WXMAC_CARBON__, and __WXMAC_OSX__ were being treated as 0/1 value instead of (un)defined symbol

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2005-04-04 10:34:56 +00:00
parent bdd9b1ad47
commit 6d8edd32b5
10 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/features.h
View File

@@ -30,9 +30,9 @@
#endif
/* taskbar is implemented in the major ports */
#if defined(__WXMSW__) || defined(__WXCOCOA__) || \
defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) || \
(defined(__WXMAC__) && defined(__WXMAC_OSX__)) || defined(__WXCOCOA__)
#if defined(__WXMSW__) || defined(__WXCOCOA__) \
|| defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) \
|| defined(__WXMAC_OSX__) || defined(__WXCOCOA__)
#define wxHAS_TASK_BAR_ICON
#else
#undef wxHAS_TASK_BAR_ICON

2
include/wx/mac/apptbase.h
View File

@@ -1,4 +1,4 @@
#if __WXMAC_CLASSIC__
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/apptbase.h"
#else
#include "wx/mac/carbon/apptbase.h"

2
include/wx/mac/apptrait.h
View File

@@ -1,4 +1,4 @@
#if __WXMAC_CLASSIC__
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/apptrait.h"
#else
#include "wx/mac/carbon/apptrait.h"

2
include/wx/mac/display.h
View File

@@ -1,4 +1,4 @@
#if __WXMAC_CLASSIC__
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/display.h"
#else
#include "wx/mac/carbon/display.h"

2
include/wx/mac/gsockmac.h
View File

@@ -1,4 +1,4 @@
#if __WXMAC_CLASSIC__
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/gsockmac.h"
#else
#include "wx/mac/carbon/gsockmac.h"

2
include/wx/mac/helpxxxx.h
View File

@@ -1,4 +1,4 @@
#if __WXMAC_CLASSIC__
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/helpxxxx.h"
#else
#include "wx/mac/carbon/helpxxxx.h"

2
include/wx/mac/imaglist.h
View File

@@ -1,4 +1,4 @@
#if __WXMAC_CLASSIC__
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/imaglist.h"
#else
#include "wx/mac/carbon/imaglist.h"

2
include/wx/mac/listctrl.h
View File

@@ -1,4 +1,4 @@
#if __WXMAC_CLASSIC__
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/listctrl.h"
#else
#include "wx/mac/carbon/listctrl.h"

2
include/wx/mac/treectrl.h
View File

@@ -1,4 +1,4 @@
#if __WXMAC_CLASSIC__
#ifdef __WXMAC_CLASSIC__
#include "wx/mac/classic/treectl.h"
#else
#include "wx/mac/carbon/treectrl.h"

5
src/mac/classic/app.cpp
View File

@@ -1856,14 +1856,9 @@ bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below
wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key !=
WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons"));
#if __WXMAC_CARBON__
//TODO: Low get map...
return !!(GetCurrentKeyModifiers() & wxKeyCodeToMacModifier(key));
#else
KeyMap keymap;
GetKeys(keymap);
return !!(BitTst(keymap, (sizeof(KeyMap)*8) - key));
#endif
}
#if !TARGET_CARBON