__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
2004-10-17 10:36:33 +00:00 · 2004-10-17 10:36:33 +00:00 · ca80fdee5e
commit ca80fdee5e
parent c9433ea976
81 changed files with 82 additions and 86 deletions
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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() ;
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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
--- 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
--- 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 )
    {
--- 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 );