added GetHbrush() and GetHbrushOf()

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 823ad49548812d00d698930e286745b6b42a584d..3c3fa3a2ab4f916bcc9b8199b0af4068ff28d052 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -7,7 +7,7 @@
 *  RCS-ID:      $Id$ 
 *  Copyright:   (c) 
 *  Licence:     wxWindows licence 
-**/
+*/
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
 
@@ -24,19 +24,23 @@
 
 #include "wx/platform.h"
 
+/*  RN - only double-check the environment when building in C++ 
+    Shouldn't configure pass the environment to all sub-libs too? */
+#ifdef __cplusplus
 /*  Make sure the environment is set correctly */
-#if defined(__WXMSW__) && defined(__X__)
-    #error "Target can't be both X and Windows"
-#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
+#   if defined(__WXMSW__) && defined(__X__)
+#       error "Target can't be both X and Windows"
+#   elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
       !defined(__WXPM__) && !defined(__WXMAC__) && !defined(__WXCOCOA__) && \
       !defined(__X__) && !defined(__WXMGL__) && !defined(__WXX11__) && \
       wxUSE_GUI
-    #ifdef __UNIX__
-        #error "No Target! You should use wx-config program for compilation flags!"
-    #else /*  !Unix */
-    #error "No Target! You should use supplied makefiles for compilation!"
-    #endif /*  Unix/!Unix */
-#endif
+#       ifdef __UNIX__
+#           error "No Target! You should use wx-config program for compilation flags!"
+#       else /*  !Unix */
+#           error "No Target! You should use supplied makefiles for compilation!"
+#       endif /*  Unix/!Unix */
+#   endif
+#endif /*__cplusplus*/
 
 #ifndef __WXWINDOWS__
     #define __WXWINDOWS__ 1
@@ -726,7 +730,7 @@ typedef wxUint32 wxDword;
     #define wxLongLong_t __int64
     #define wxLongLongSuffix i64
     #define wxLongLongFmtSpec _T("Ld")
-#elif (defined(__WATCOMC__) && defined(__WIN32__))
+#elif (defined(__WATCOMC__) && (defined(__WIN32__) || defined(__DOS__)))
       #define wxLongLong_t __int64
       #define wxLongLongSuffix i64
       #define wxLongLongFmtSpec _T("Ld")
@@ -1414,7 +1418,7 @@ enum
 /*  id for a separator line in the menu (invalid for normal item) */
 enum
 {
-    wxID_SEPARATOR = -1
+    wxID_SEPARATOR = -2
 };
 
 /*  Standard menu IDs */
@@ -2012,22 +2016,22 @@ typedef unsigned short  WXWORD;
 typedef void*       WXWidget;
 typedef void*       WXWindow;
 typedef void*       WXDisplay;
-/*
-typedef WindowPtr       WXHWND;
-typedef Handle          WXHANDLE;
-typedef CIconHandle     WXHICON;
+
+/* typedef WindowPtr       WXHWND; */
+/* typedef Handle          WXHANDLE; */
+/* typedef CIconHandle     WXHICON; */
 /* typedef unsigned long   WXHFONT; */
-typedef MenuHandle      WXHMENU;
+/* typedef MenuHandle      WXHMENU; */
 /* typedef unsigned long   WXHPEN; */
 /* typedef unsigned long   WXHBRUSH; */
 /* typedef unsigned long   WXHPALETTE; */
-typedef CursHandle      WXHCURSOR;
-typedef RgnHandle       WXHRGN;
+/* typedef CursHandle      WXHCURSOR; */
+/* typedef RgnHandle       WXHRGN; */
 /* typedef unsigned long   WXHACCEL; */
 /* typedef unsigned long   WXHINSTANCE; */
 /* typedef unsigned long   WXHIMAGELIST; */
 /* typedef unsigned long   WXHGLOBAL; */
-typedef GrafPtr         WXHDC;
+/* typedef GrafPtr         WXHDC; */
 /* typedef unsigned int    WXWPARAM; */
 /* typedef long            WXLPARAM; */
 /* typedef void *          WXRGNDATA; */
@@ -2037,11 +2041,11 @@ typedef GrafPtr         WXHDC;
 /* typedef void *          WXDRAWITEMSTRUCT; */
 /* typedef void *          WXMEASUREITEMSTRUCT; */
 /* typedef void *          WXLPCREATESTRUCT; */
-typedef int (*WXFARPROC)();
+/* typedef int (*WXFARPROC)(); */
+
+/* typedef WindowPtr       WXWindow; */
+/* typedef ControlHandle   WXWidget; */
 
-typedef WindowPtr       WXWindow;
-typedef ControlHandle   WXWidget;
-*/
 #endif
 
 #ifdef __WXCOCOA__