X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a6c0a8bdadc52e87e6d1e315d1bf6f192880bd0..246037e22990a4719c672c2e2a8b62b99cc4d49c:/include/wx/gdicmn.h diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index dec74b5bb9..f0b52eefde 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -21,11 +21,11 @@ #include "wx/hash.h" #include "wx/setup.h" -#ifdef __WINDOWS__ +#ifdef __WXMSW__ #include "wx/msw/colour.h" -#elif defined(__MOTIF__) +#elif defined(__WXMOTIF__) #include "wx/xt/colour.h" -#elif defined(__GTK__) +#elif defined(__WXGTK__) #include "wx/gtk/colour.h" #endif @@ -98,7 +98,7 @@ class WXDLLEXPORT wxRealPoint class WXDLLEXPORT wxPoint { public: -#if defined(__WINDOWS__) && !defined(__WIN32__) +#if defined(__WXMSW__) && !defined(__WIN32__) int x; int y; #else @@ -330,7 +330,7 @@ extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor); // Useful macro for create icons portably -#ifdef __WINDOWS__ +#ifdef __WXMSW__ # define wxICON(X) wxIcon(X##_icon); #elif defined(__X__) # define wxICON(X) wxIcon(X##_bits, X##_width, X##_height);