From ca80fdee5eea286d700e0a8f03c88da9f4f88ade Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 17 Oct 2004 10:36:33 +0000
Subject: [PATCH] __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
---
 include/wx/mac/accel.h          | 2 +-
 include/wx/mac/app.h            | 2 +-
 include/wx/mac/bitmap.h         | 2 +-
 include/wx/mac/bmpbuttn.h       | 2 +-
 include/wx/mac/brush.h          | 2 +-
 include/wx/mac/button.h         | 2 +-
 include/wx/mac/carbon/listbox.h | 4 ++--
 include/wx/mac/checkbox.h       | 2 +-
 include/wx/mac/checklst.h       | 2 +-
 include/wx/mac/chkconf.h        | 2 +-
 include/wx/mac/choice.h         | 2 +-
 include/wx/mac/clipbrd.h        | 2 +-
 include/wx/mac/colordlg.h       | 2 +-
 include/wx/mac/colour.h         | 2 +-
 include/wx/mac/combobox.h       | 2 +-
 include/wx/mac/control.h        | 2 +-
 include/wx/mac/cursor.h         | 2 +-
 include/wx/mac/dataform.h       | 2 +-
 include/wx/mac/dataobj.h        | 2 +-
 include/wx/mac/dataobj2.h       | 2 +-
 include/wx/mac/dc.h             | 2 +-
 include/wx/mac/dcclient.h       | 2 +-
 include/wx/mac/dcmemory.h       | 2 +-
 include/wx/mac/dcprint.h        | 2 +-
 include/wx/mac/dcscreen.h       | 2 +-
 include/wx/mac/dialog.h         | 2 +-
 include/wx/mac/dirdlg.h         | 2 +-
 include/wx/mac/dnd.h            | 2 +-
 include/wx/mac/filedlg.h        | 2 +-
 include/wx/mac/font.h           | 2 +-
 include/wx/mac/fontdlg.h        | 2 +-
 include/wx/mac/frame.h          | 2 +-
 include/wx/mac/gauge.h          | 2 +-
 include/wx/mac/gdiobj.h         | 2 +-
 include/wx/mac/glcanvas.h       | 2 +-
 include/wx/mac/icon.h           | 2 +-
 include/wx/mac/joystick.h       | 2 +-
 include/wx/mac/listbox.h        | 2 +-
 include/wx/mac/macnotfy.h       | 2 +-
 include/wx/mac/mdi.h            | 2 +-
 include/wx/mac/menu.h           | 2 +-
 include/wx/mac/menuitem.h       | 2 +-
 include/wx/mac/metafile.h       | 2 +-
 include/wx/mac/mimetype.h       | 2 +-
 include/wx/mac/minifram.h       | 2 +-
 include/wx/mac/msgdlg.h         | 2 +-
 include/wx/mac/notebook.h       | 2 +-
 include/wx/mac/palette.h        | 2 +-
 include/wx/mac/pen.h            | 2 +-
 include/wx/mac/pnghand.h        | 2 +-
 include/wx/mac/pngread.h        | 2 +-
 include/wx/mac/printdlg.h       | 2 +-
 include/wx/mac/printmac.h       | 2 +-
 include/wx/mac/private.h        | 2 +-
 include/wx/mac/radiobox.h       | 2 +-
 include/wx/mac/radiobut.h       | 2 +-
 include/wx/mac/region.h         | 2 +-
 include/wx/mac/scrolbar.h       | 2 +-
 include/wx/mac/slider.h         | 2 +-
 include/wx/mac/sound.h          | 2 +-
 include/wx/mac/spinbutt.h       | 2 +-
 include/wx/mac/spinctrl.h       | 2 +-
 include/wx/mac/statbmp.h        | 2 +-
 include/wx/mac/statbox.h        | 2 +-
 include/wx/mac/statline.h       | 2 +-
 include/wx/mac/stattext.h       | 2 +-
 include/wx/mac/statusbr.h       | 2 +-
 include/wx/mac/tabctrl.h        | 2 +-
 include/wx/mac/taskbarosx.h     | 2 +-
 include/wx/mac/textctrl.h       | 2 +-
 include/wx/mac/tglbtn.h         | 2 +-
 include/wx/mac/timer.h          | 2 +-
 include/wx/mac/toolbar.h        | 2 +-
 include/wx/mac/tooltip.h        | 2 +-
 include/wx/mac/toplevel.h       | 2 +-
 include/wx/mac/uma.h            | 2 +-
 include/wx/mac/window.h         | 2 +-
 include/wx/platform.h           | 4 ----
 src/common/gdicmn.cpp           | 4 ++--
 src/generic/listctrl.cpp        | 2 +-
 src/generic/treectlg.cpp        | 2 +-
 81 files changed, 82 insertions(+), 86 deletions(-)

diff --git a/include/wx/mac/accel.h b/include/wx/mac/accel.h
index ae8c042e5c..6d10bdf102 100644
--- 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 921fc707ce..fe3fc75a7a 100644
--- 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 2f9a0678a9..5a3617ebe0 100644
--- 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 7597bce01d..8c6689edbf 100644
--- 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 aef4c28a4f..4e1100635f 100644
--- 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 29e2f83bf6..cfd26d6327 100644
--- 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 d5aa80277d..37e44ee9cd 100644
--- 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 c97212cd4c..f6abb3a4fc 100644
--- 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 748eea71ce..0fdeac8250 100644
--- 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 bfec9f32f9..7f7e50beaa 100644
--- 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 d15a2b631a..0a01e09d00 100644
--- 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 60a4b6a5e5..bf8817c892 100644
--- 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 b7c91d7b22..f2a6a58927 100644
--- 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 3911e4eb08..c2f22e7ce5 100644
--- 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 08895ae794..97e430d68a 100644
--- 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 33202c6b7a..54c2908275 100644
--- 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 56cb0af5f0..a928583270 100644
--- 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 10d1dbec3f..791152fc18 100644
--- 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 842aa3ce0c..cbcb36df65 100644
--- 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 d624849b5b..bc19844dae 100644
--- 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 b6a814cfea..c9522603bf 100644
--- 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 3c4da1bc68..fad0744bd9 100644
--- 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 61e6357003..485785e603 100644
--- 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 cef829bf67..e66d8d8da5 100644
--- 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 f83a89ed78..c21c4033d2 100644
--- 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 cc66b8b83d..64e4ba5713 100644
--- 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 82c8a82aff..ac42223f2a 100644
--- 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 96890e0ab1..d2c086c069 100644
--- 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 fb0f352832..105abe3ffc 100644
--- 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 d6679b0d56..e1f2d07ae5 100644
--- 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 8cec0e4a85..efedfa31d3 100644
--- 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 23430d191e..09f19cc46e 100644
--- 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 44bf985bfa..2db495e7bd 100644
--- 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 1f0d876922..c0ca4c1e0a 100644
--- 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 2699206d7d..3dfff78fa3 100644
--- 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 b17eb57216..b72f92dd42 100644
--- 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 f819c84634..fddba511e0 100644
--- 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 4259d33eb0..945eee724c 100644
--- 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 0437ba41b2..ab82c3ce94 100644
--- 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 ae3b7fac6a..de365bcebf 100644
--- 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 103161b3c5..1e6775a2f4 100644
--- 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 16bfdd36d5..0108423b74 100644
--- 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 da21eef027..d1293a0467 100644
--- 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 eeca3d1fd5..c4fe350c84 100644
--- 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 d521ebcc66..557c9474cc 100644
--- 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 758b8b1171..3543a6bec8 100644
--- 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 26ab3a5ea7..a3175c082c 100644
--- 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 152cc7c537..13ac93a6a4 100644
--- 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 67346708c7..f05813dc28 100644
--- 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 5e34107a1b..8537bb1a17 100644
--- 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 0205de9392..ebdd8419fa 100644
--- 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 04d40bdabb..7f5c1e3c19 100644
--- 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 200c65e7db..91a15a3a2d 100644
--- 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 4c6867e1ec..6e8e51aa04 100644
--- 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 2c9c5c1d98..24ace18b22 100644
--- 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 806eae0f03..3adce9873c 100644
--- 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 cf99cf18f6..831ae101e1 100644
--- 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 8f0e782a20..9b0a2a0500 100644
--- 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 04ba2b8b18..38a23815dd 100644
--- 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 5d4e9dd8b5..4c22cf106a 100644
--- 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 635f5179be..3b600761f7 100644
--- 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 17a3243b70..eab38be618 100755
--- 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 2b63148d13..48db4294e5 100644
--- 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 fe92b4450d..3a9b32b9d9 100644
--- 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 01818d9e2e..5d0dd02040 100644
--- 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 633af8ee54..10b0ddd10a 100644
--- 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 4e4c3e924f..3a15124a59 100644
--- 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 77f48fdd08..7d00a02106 100644
--- 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 6706ffc6dc..6dd7512845 100644
--- 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 607d241622..1cae5a5be7 100644
--- 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 94bdbaffc5..c7104ac928 100644
--- 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 e4eeb8cca2..2b7813609d 100644
--- 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 8680c5e57c..2570eb0771 100644
--- 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 2bf6a94b23..8fc5a25d64 100644
--- 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 437a33ce7d..2ae8a06556 100644
--- 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 5cb1999817..b0f5d3329b 100644
--- 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 774bdd5806..a29e3f10fb 100644
--- 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 06886d705a..e9bf1eba6f 100644
--- 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 099a576d94..b9c743a87a 100644
--- 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 7ef33c8341..3c88613e76 100644
--- 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 d8017cd81c..ed8dacdd7b 100644
--- 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 );
-- 
2.45.2