fixed cases where __WXMAC_CLASSIC__, __WXMAC_CARBON__, and __WXMAC_OSX__ were being...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/features.h b/include/wx/features.h
index 62370ae63b1b3c5ffc8b6235ee6a34518affea08..fbe9692d3ac529ce8457f5adaa0bf6ce7d0cda3a 100644 (file)
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -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

diff --git a/include/wx/mac/apptbase.h b/include/wx/mac/apptbase.h
index a2f5ea97f9f6ae67f56149e2e43ef126ef31b546..6216f9082c1f1e132ac2ee92b5e52960f87ec57a 100644 (file)
--- a/include/wx/mac/apptbase.h
+++ b/include/wx/mac/apptbase.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/apptbase.h"
 #else
 #include "wx/mac/carbon/apptbase.h"

diff --git a/include/wx/mac/apptrait.h b/include/wx/mac/apptrait.h
index fe7b4791a91714a5b664476f29e57d8960350c5b..e3ff75ce83109e9d16d06cf462a37654bf5cf0af 100644 (file)
--- a/include/wx/mac/apptrait.h
+++ b/include/wx/mac/apptrait.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/apptrait.h"
 #else
 #include "wx/mac/carbon/apptrait.h"

diff --git a/include/wx/mac/display.h b/include/wx/mac/display.h
index 9a523e41f874787b37de9040d52c9c35a396bfb5..4347bb27972cfad391af3889f2f69c63e6f69852 100644 (file)
--- a/include/wx/mac/display.h
+++ b/include/wx/mac/display.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/display.h"
 #else
 #include "wx/mac/carbon/display.h"

diff --git a/include/wx/mac/gsockmac.h b/include/wx/mac/gsockmac.h
index 68bdf47b8544a1f96524ca9f9933c0a60fb41aa9..23cc004d5f62874d9e7c4bd6668986d735401991 100644 (file)
--- a/include/wx/mac/gsockmac.h
+++ b/include/wx/mac/gsockmac.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/gsockmac.h"
 #else
 #include "wx/mac/carbon/gsockmac.h"

diff --git a/include/wx/mac/helpxxxx.h b/include/wx/mac/helpxxxx.h
index 9cfb4b2994491be31b1792a576e1c62d8dddc9e2..aaea7f287146c606635670591e4309a0bed6c4a5 100644 (file)
--- a/include/wx/mac/helpxxxx.h
+++ b/include/wx/mac/helpxxxx.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/helpxxxx.h"
 #else
 #include "wx/mac/carbon/helpxxxx.h"

diff --git a/include/wx/mac/imaglist.h b/include/wx/mac/imaglist.h
index f09045cc8946616c787e9b10dcfc3cfe6aef87ab..6d8ca15ec978ad6a2418c0e1a207d3af6073fa2d 100644 (file)
--- a/include/wx/mac/imaglist.h
+++ b/include/wx/mac/imaglist.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/imaglist.h"
 #else
 #include "wx/mac/carbon/imaglist.h"

diff --git a/include/wx/mac/listctrl.h b/include/wx/mac/listctrl.h
index a38858d19d896c4ec12c057f27387fbabfa6e2a4..be9ffdfed1aafb20af197f8d2aff11c1f972276d 100644 (file)
--- a/include/wx/mac/listctrl.h
+++ b/include/wx/mac/listctrl.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/listctrl.h"
 #else
 #include "wx/mac/carbon/listctrl.h"

diff --git a/include/wx/mac/treectrl.h b/include/wx/mac/treectrl.h
index a7781a8ed65aee8e1283e9843163ce88452cd781..09a33f0daee44cce5467694b0bc281ce0f4af408 100644 (file)
--- a/include/wx/mac/treectrl.h
+++ b/include/wx/mac/treectrl.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/treectl.h"
 #else
 #include "wx/mac/carbon/treectrl.h"

diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp
index c2aaf86cd00aa46a4322579e189a7cb88e2e1ded..f3506c025c6a3b692833ef285de745b9888e5333 100644 (file)
--- a/src/mac/classic/app.cpp
+++ b/src/mac/classic/app.cpp
@@ -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
+    KeyMap keymap; 
+    GetKeys(keymap);
+    return !!(BitTst(keymap, (sizeof(KeyMap)*8) - key));
 }
 
 #if !TARGET_CARBON