added "access" parameter to wxFile::Create and Open. The default value is

[wxWidgets.git] / include / wx / gdicmn.h

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index dec74b5bb9136c100f0423cf702b0e82ff0ed79f..f0b52eefdee26de52d80cfe055c12a5e07e9cd4f 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -21,11 +21,11 @@
 #include "wx/hash.h"
 #include "wx/setup.h"
 
 #include "wx/hash.h"
 #include "wx/setup.h"
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

 #include "wx/msw/colour.h"
 #include "wx/msw/colour.h"

-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)

 #include "wx/xt/colour.h"
 #include "wx/xt/colour.h"

-#elif defined(__GTK__)
+#elif defined(__WXGTK__)

 #include "wx/gtk/colour.h"
 #endif
 
 #include "wx/gtk/colour.h"
 #endif
 


@@ -98,7 +98,7 @@ class WXDLLEXPORT wxRealPoint
 class WXDLLEXPORT wxPoint
 {
  public:
 class WXDLLEXPORT wxPoint
 {
  public:

-#if defined(__WINDOWS__) && !defined(__WIN32__)
+#if defined(__WXMSW__) && !defined(__WIN32__)

   int x;
   int y;
 #else
   int x;
   int y;
 #else


@@ -330,7 +330,7 @@ extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor);
 
 // Useful macro for create icons portably
 
 
 // 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);
 # define wxICON(X) wxIcon(X##_icon);
 #elif defined(__X__)
 # define wxICON(X) wxIcon(X##_bits, X##_width, X##_height);