__WXMAC_OSBUILDTYPE__ selections are now only defined if they are TRUE

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

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

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

diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h
index 2f9a0678a916fb5848bfbdaf54caadf1273c8f66..5a3617ebe09a9ea6c9c3df0649ce69ba7b59f51c 100644 (file)
--- a/include/wx/mac/bitmap.h
+++ b/include/wx/mac/bitmap.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/bitmap.h"
 #else
 #include "wx/mac/carbon/bitmap.h"

diff --git a/include/wx/mac/bmpbuttn.h b/include/wx/mac/bmpbuttn.h
index 7597bce01da3dbf7726ac18ec230ea64b1febb02..8c6689edbf9f29acb95f065de012a945644352df 100644 (file)
--- a/include/wx/mac/bmpbuttn.h
+++ b/include/wx/mac/bmpbuttn.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/bmpbuttn.h"
 #else
 #include "wx/mac/carbon/bmpbuttn.h"

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

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

diff --git a/include/wx/mac/carbon/listbox.h b/include/wx/mac/carbon/listbox.h
index d5aa80277db3cff8447bdea33ebf517410ab02ee..37e44ee9cd204330ff16cf9fdea300f02f10f24d 100644 (file)
--- a/include/wx/mac/carbon/listbox.h
+++ b/include/wx/mac/carbon/listbox.h
@@ -130,7 +130,7 @@ public:
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
     
     // Windows callbacks
-#if !__WXMAC_OSX__
+#ifndef __WXMAC_OSX__
     void OnChar(wxKeyEvent& event);
 #endif
 
@@ -151,7 +151,7 @@ protected:
     int             MacGetSelections(wxArrayInt& aSelections) const ;
     bool            MacIsSelected( int n ) const ;
     void            MacScrollTo( int n ) ;
-#if !__WXMAC_OSX__
+#ifndef __WXMAC_OSX__
     void            OnSize( wxSizeEvent &size ) ;
 #endif
     void            MacDoClick() ;

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

diff --git a/include/wx/mac/checklst.h b/include/wx/mac/checklst.h
index 748eea71cebf64db104344e02a9d99d0986347b7..0fdeac8250ff0811d292ec8fcc3e92b9fccf605b 100644 (file)
--- a/include/wx/mac/checklst.h
+++ b/include/wx/mac/checklst.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/checklst.h"
 #else
 #include "wx/mac/carbon/checklst.h"

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

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

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

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

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

diff --git a/include/wx/mac/combobox.h b/include/wx/mac/combobox.h
index 08895ae794f6a75f2501f7e9871300d317b45131..97e430d68afa2b04b52ad992d21ede3a077fb8ff 100644 (file)
--- a/include/wx/mac/combobox.h
+++ b/include/wx/mac/combobox.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/combobox.h"
 #else
 #include "wx/mac/carbon/combobox.h"

diff --git a/include/wx/mac/control.h b/include/wx/mac/control.h
index 33202c6b7a3084cdb65f09c6157458354398c625..54c2908275cde6e9b6852066ec41c0909656e964 100644 (file)
--- a/include/wx/mac/control.h
+++ b/include/wx/mac/control.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/control.h"
 #else
 #include "wx/mac/carbon/control.h"

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

diff --git a/include/wx/mac/dataform.h b/include/wx/mac/dataform.h
index 10d1dbec3f0a7824ec6b437a83596a1c0b36767e..791152fc18fd52a6f7e2095c866570fa290d7938 100644 (file)
--- a/include/wx/mac/dataform.h
+++ b/include/wx/mac/dataform.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/dataform.h"
 #else
 #include "wx/mac/carbon/dataform.h"

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

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

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

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

diff --git a/include/wx/mac/dcmemory.h b/include/wx/mac/dcmemory.h
index 61e635700398e26f560eb1848f4294ec5fc1cafe..485785e603f0090d7b247c6927819bb1dbaba7f1 100644 (file)
--- a/include/wx/mac/dcmemory.h
+++ b/include/wx/mac/dcmemory.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/dcmemory.h"
 #else
 #include "wx/mac/carbon/dcmemory.h"

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

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

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

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

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

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

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

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

diff --git a/include/wx/mac/frame.h b/include/wx/mac/frame.h
index 23430d191e49b8bb2d68a8c509fc6a8c3fcea71b..09f19cc46e15f97d3dac61330d3f8c830df1926a 100644 (file)
--- a/include/wx/mac/frame.h
+++ b/include/wx/mac/frame.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/frame.h"
 #else
 #include "wx/mac/carbon/frame.h"

diff --git a/include/wx/mac/gauge.h b/include/wx/mac/gauge.h
index 44bf985bfa1a4cb1175ccbec35de04a6fe1e3978..2db495e7bddfb3127fecbdef9cc9a19684cc750e 100644 (file)
--- a/include/wx/mac/gauge.h
+++ b/include/wx/mac/gauge.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/gauge.h"
 #else
 #include "wx/mac/carbon/gauge.h"

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

diff --git a/include/wx/mac/glcanvas.h b/include/wx/mac/glcanvas.h
index 2699206d7d3c8e9867f2503d2a996d27e7ae35e2..3dfff78fa33723fa37d57602d178192c1bb29d7c 100644 (file)
--- a/include/wx/mac/glcanvas.h
+++ b/include/wx/mac/glcanvas.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/glcanvas.h"
 #else
 #include "wx/mac/carbon/glcanvas.h"

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

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

diff --git a/include/wx/mac/listbox.h b/include/wx/mac/listbox.h
index 4259d33eb0f0d478453c7b07cb90044f9db98361..945eee724c718aa56ccc57e4a8f6667b461f4c71 100644 (file)
--- a/include/wx/mac/listbox.h
+++ b/include/wx/mac/listbox.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/listbox.h"
 #else
 #include "wx/mac/carbon/listbox.h"

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

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

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

diff --git a/include/wx/mac/menuitem.h b/include/wx/mac/menuitem.h
index 16bfdd36d54102f02758efdd7704d0999a570999..0108423b746f40a0e721a0440c27687a789152c3 100644 (file)
--- a/include/wx/mac/menuitem.h
+++ b/include/wx/mac/menuitem.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/menuitem.h"
 #else
 #include "wx/mac/carbon/menuitem.h"

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

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

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

diff --git a/include/wx/mac/msgdlg.h b/include/wx/mac/msgdlg.h
index 758b8b11712615c374d1c0f42e3d1446aaab14c0..3543a6bec8df58b3bf7cf9dbc7667fcfbf15a135 100644 (file)
--- a/include/wx/mac/msgdlg.h
+++ b/include/wx/mac/msgdlg.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/msgdlg.h"
 #else
 #include "wx/mac/carbon/msgdlg.h"

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

diff --git a/include/wx/mac/palette.h b/include/wx/mac/palette.h
index 152cc7c5370c21d0091b1fbc70bbc0d16dd04cc8..13ac93a6a427182400356a52286d75b513d78950 100644 (file)
--- a/include/wx/mac/palette.h
+++ b/include/wx/mac/palette.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/palette.h"
 #else
 #include "wx/mac/carbon/palette.h"

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

diff --git a/include/wx/mac/pnghand.h b/include/wx/mac/pnghand.h
index 5e34107a1bf8fce5947dd3689541f6496128980f..8537bb1a17f28b9bedeaaf03ef6c55c6112ca3a0 100644 (file)
--- a/include/wx/mac/pnghand.h
+++ b/include/wx/mac/pnghand.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/pnghand.h"
 #else
 #include "wx/mac/carbon/pnghand.h"

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

diff --git a/include/wx/mac/printdlg.h b/include/wx/mac/printdlg.h
index 04d40bdabb459430134de4e6f4b8f1c39785cba9..7f5c1e3c19caa8a77dfa52789dfa20e10ff71597 100644 (file)
--- a/include/wx/mac/printdlg.h
+++ b/include/wx/mac/printdlg.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/printdlg.h"
 #else
 #include "wx/mac/carbon/printdlg.h"

diff --git a/include/wx/mac/printmac.h b/include/wx/mac/printmac.h
index 200c65e7dbcbd08d338519a7a811711734912ed5..91a15a3a2d5525b045aeb323323ccbe6f804de80 100644 (file)
--- a/include/wx/mac/printmac.h
+++ b/include/wx/mac/printmac.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/printmac.h"
 #else
 #include "wx/mac/carbon/printmac.h"

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

diff --git a/include/wx/mac/radiobox.h b/include/wx/mac/radiobox.h
index 2c9c5c1d983ac060197808c210d5f46099b6be74..24ace18b220f23c359167387ce0ee0c1bae31b83 100644 (file)
--- a/include/wx/mac/radiobox.h
+++ b/include/wx/mac/radiobox.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/radiobox.h"
 #else
 #include "wx/mac/carbon/radiobox.h"

diff --git a/include/wx/mac/radiobut.h b/include/wx/mac/radiobut.h
index 806eae0f030f6876ab8d9b1e102e4753eed69977..3adce9873ce844fcabce5aedcc04202e8607e91d 100644 (file)
--- a/include/wx/mac/radiobut.h
+++ b/include/wx/mac/radiobut.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/radiobut.h"
 #else
 #include "wx/mac/carbon/radiobut.h"

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

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

diff --git a/include/wx/mac/slider.h b/include/wx/mac/slider.h
index 04ba2b8b183214d37a5aee26e4c1fb2c5837c253..38a23815dd4d5452e4fc81634821c7b3f57a02c5 100644 (file)
--- a/include/wx/mac/slider.h
+++ b/include/wx/mac/slider.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/slider.h"
 #else
 #include "wx/mac/carbon/slider.h"

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

diff --git a/include/wx/mac/spinbutt.h b/include/wx/mac/spinbutt.h
index 635f5179be81fdafae8265bac3b425911644c15e..3b600761f7dbcf73dd66fb814b11569119ac2872 100644 (file)
--- a/include/wx/mac/spinbutt.h
+++ b/include/wx/mac/spinbutt.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/spinbutt.h"
 #else
 #include "wx/mac/carbon/spinbutt.h"

diff --git a/include/wx/mac/spinctrl.h b/include/wx/mac/spinctrl.h
index 17a3243b70913d43fd23b85bb5b1724c958e34d7..eab38be6188e29c0fd88eb456f871562600b1a99 100755 (executable)
--- a/include/wx/mac/spinctrl.h
+++ b/include/wx/mac/spinctrl.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/spinctrl.h"
 #else
 #include "wx/mac/carbon/spinctrl.h"

diff --git a/include/wx/mac/statbmp.h b/include/wx/mac/statbmp.h
index 2b63148d130fb51de7f4efa8cef08dca8fd0ccf0..48db4294e52ca56b3e8256d91727fdb602741736 100644 (file)
--- a/include/wx/mac/statbmp.h
+++ b/include/wx/mac/statbmp.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/statbmp.h"
 #else
 #include "wx/mac/carbon/statbmp.h"

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

diff --git a/include/wx/mac/statline.h b/include/wx/mac/statline.h
index 01818d9e2eba81bb52c892bc66e64085b92389f0..5d0dd020408c5f185f288d3175f5d3f2ecb00e2f 100644 (file)
--- a/include/wx/mac/statline.h
+++ b/include/wx/mac/statline.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/statline.h"
 #else
 #include "wx/mac/carbon/statline.h"

diff --git a/include/wx/mac/stattext.h b/include/wx/mac/stattext.h
index 633af8ee5484890a57810db2fca01679d7a2c5ea..10b0ddd10a848cd45157add43ed86fe55efeb32d 100644 (file)
--- a/include/wx/mac/stattext.h
+++ b/include/wx/mac/stattext.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/stattext.h"
 #else
 #include "wx/mac/carbon/stattext.h"

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

diff --git a/include/wx/mac/tabctrl.h b/include/wx/mac/tabctrl.h
index 77f48fdd080f4c6e2465674085bedb6dcf0b6038..7d00a02106bb9e4d5f316d41f2d527b161a8dab2 100644 (file)
--- a/include/wx/mac/tabctrl.h
+++ b/include/wx/mac/tabctrl.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/tabctrl.h"
 #else
 #include "wx/mac/carbon/tabctrl.h"

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

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

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

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

diff --git a/include/wx/mac/toolbar.h b/include/wx/mac/toolbar.h
index 8680c5e57cb0c27fc0c818e6b7b6218d13768ae3..2570eb07719390846db48c61c3c34e29fd612820 100644 (file)
--- a/include/wx/mac/toolbar.h
+++ b/include/wx/mac/toolbar.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/toolbar.h"
 #else
 #include "wx/mac/carbon/toolbar.h"

diff --git a/include/wx/mac/tooltip.h b/include/wx/mac/tooltip.h
index 2bf6a94b2382ca782a7a5653e19a0cb5a73715a7..8fc5a25d64ff45270bd14d46cb83feb33ac7ee8b 100644 (file)
--- a/include/wx/mac/tooltip.h
+++ b/include/wx/mac/tooltip.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/tooltip.h"
 #else
 #include "wx/mac/carbon/tooltip.h"

diff --git a/include/wx/mac/toplevel.h b/include/wx/mac/toplevel.h
index 437a33ce7d2bdd9bffeca5aafd64c4d0304992a7..2ae8a0655674b09b188b6cbcead735384e9c0f7d 100644 (file)
--- a/include/wx/mac/toplevel.h
+++ b/include/wx/mac/toplevel.h
@@ -1,4 +1,4 @@
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
 #include "wx/mac/classic/toplevel.h"
 #else
 #include "wx/mac/carbon/toplevel.h"

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

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 06886d705ab37ae2a631c465ef9e68d19331473a..e9bf1eba6fb7181f38325f6624d4dc816af60554 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -33,17 +33,13 @@
     #if defined(__MACH__)
         #define __WXMAC_OSX__ 1
         #define __WXMAC_CARBON__ 1
-        #define __WXMAC_CLASSIC__ 0
         #ifdef __WXMAC_XCODE__
             #include "wx/mac/carbon/config_xcode.h"
         #endif
     #else
-        #define __WXMAC_OSX__ 0
         #if TARGET_CARBON
             #define __WXMAC_CARBON__ 1
-            #define __WXMAC_CLASSIC__ 0
         #else
-            #define __WXMAC_CARBON__ 0
             #define __WXMAC_CLASSIC__ 1
         #endif
     #endif

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 099a576d946e120457b4251a7b09688a8d9830bb..b9c743a87a6b071bafec137891cf80a6dd613b35 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -538,7 +538,7 @@ void wxInitializeStockObjects ()
 
     GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
     sizeFont = fontSize ;
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
     wxNORMAL_FONT = new wxFont (fontSize, wxMODERN, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal(fontName) );
 #else
     wxNORMAL_FONT = new wxFont () ;
@@ -563,7 +563,7 @@ void wxInitializeStockObjects ()
 #elif defined(__WXMAC__)
     wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
     wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__
   GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
     wxSMALL_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal( fontName ) );
 #else

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 7ef33c834116f30bbb65253fe7f22c8e55b3a9c5..3c88613e763116be45fd68617a05a9096b8c0786 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -4662,7 +4662,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
 
     m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0,0), size, style );
 
-#if defined( __WXMAC__ ) && __WXMAC_CARBON__
+#ifdef  __WXMAC_CARBON__ 
     // Human Interface Guidelines ask us for a special font in this case
     if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
     {

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index d8017cd81c89e9db77fdc173dead8b0d84f9b427..ed8dacdd7bb8d3b947272390aaa09121a7006714 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -765,7 +765,7 @@ void wxGenericTreeCtrl::Init()
 
     m_lastOnSame = false;
 
-#if defined( __WXMAC__ ) && __WXMAC_CARBON__
+#ifdef __WXMAC_CARBON__ 
     m_normalFont.MacCreateThemeFont( kThemeViewsFont ) ;
 #else
     m_normalFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );