Moved image code

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 694b31a7cd8a499df861ef2187109ad54d648082..06da9d41aab181ea1789a2cfe0607108f95f2090 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -21,6 +21,7 @@
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"

+#include "wx/gtk/win_gtk.h"

 
 #endif
 
 
 #endif
 


@@ -40,12 +41,12 @@
 #endif
 #endif
 
 #endif
 #endif
 

-// Eliminate double/float warnings
+// suppress some Visual C++ warnings

 #ifdef _MSC_VER
 #ifdef _MSC_VER

-# pragma warning(disable:4244)
+#   pragma warning(disable:4244)    // cobversion from double to float
+#   pragma warning(disable:4100)    // unreferenced formal parameter

 #endif
 
 #endif
 

-

 //////////////////////////////////////////////////////////////////////////////////
 // Currently Only MS-Windows/NT, XView and Motif are supported
 //
 //////////////////////////////////////////////////////////////////////////////////
 // Currently Only MS-Windows/NT, XView and Motif are supported
 //


@@ -56,6 +57,7 @@
 # define __X__
 #endif
 
 # define __X__
 #endif
 

+#ifdef __WXMSW__

 // wxWindows checks for WIN32, not __WIN32__
 #if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__) && !defined(__WXSTUBS__))
 #define __WIN32__
 // wxWindows checks for WIN32, not __WIN32__
 #if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__) && !defined(__WXSTUBS__))
 #define __WIN32__


@@ -69,6 +71,8 @@
 #define __WIN95__
 #endif
 
 #define __WIN95__
 #endif
 

+#endif // wxMSW
+

 // Make sure the environment is set correctly
 #if defined(__WXMSW__) && defined(__X__)
 # error "Target can't be both X and Windows"
 // Make sure the environment is set correctly
 #if defined(__WXMSW__) && defined(__X__)
 # error "Target can't be both X and Windows"


@@ -149,7 +153,7 @@ typedef int wxWindowID;
 #  ifdef WXMAKINGDLL
 #    define WXDLLEXPORT __declspec( dllexport )
 #    define WXDLLEXPORT_DATA(type) __declspec( dllexport ) type
 #  ifdef WXMAKINGDLL
 #    define WXDLLEXPORT __declspec( dllexport )
 #    define WXDLLEXPORT_DATA(type) __declspec( dllexport ) type

-#    define WXDLLEXPORT_CTORFN __declspec( dllexport )
+#    define WXDLLEXPORT_CTORFN // __declspec( dllexport )

 #  elif defined(WXUSINGDLL)
 #    define WXDLLEXPORT __declspec( dllimport )
 #    define WXDLLEXPORT_DATA(type) __declspec( dllimport ) type
 #  elif defined(WXUSINGDLL)
 #    define WXDLLEXPORT __declspec( dllimport )
 #    define WXDLLEXPORT_DATA(type) __declspec( dllimport ) type


@@ -280,6 +284,19 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse;
 
 #endif  // VC++
 
 
 #endif  // VC++
 

+#if _MSC_VER > 1010
+#undef try
+#undef except
+#undef finally
+#define except(x) catch(...)
+#endif
+
+// where should i put this? we need to make sure of this as it breaks
+// the <iostream> code.
+#if !wxUSE_IOSTREAMH && defined(__WXDEBUG__)
+#undef __WXDEBUG__
+#endif
+

 // Callback function type definition
 typedef void (*wxFunction) (wxObject&, wxEvent&);
 
 // Callback function type definition
 typedef void (*wxFunction) (wxObject&, wxEvent&);
 


@@ -829,6 +846,7 @@ enum {
 #define wxID_CLEAR              5033
 #define wxID_FIND               5034
 #define wxID_DUPLICATE          5035
 #define wxID_CLEAR              5033
 #define wxID_FIND               5034
 #define wxID_DUPLICATE          5035

+#define wxID_SELECTALL          5036

 
 #define wxID_FILE1              5050
 #define wxID_FILE2              5051
 
 #define wxID_FILE1              5050
 #define wxID_FILE2              5051


@@ -882,6 +900,7 @@ typedef void *          WXRGNDATA;
 typedef void *          WXMSG;
 typedef unsigned long   WXHCONV;
 typedef unsigned long   WXHKEY;
 typedef void *          WXMSG;
 typedef unsigned long   WXHCONV;
 typedef unsigned long   WXHKEY;

+typedef unsigned long   WXHTREEITEM;

 typedef void *          WXDRAWITEMSTRUCT;
 typedef void *          WXMEASUREITEMSTRUCT;
 typedef void *          WXLPCREATESTRUCT;
 typedef void *          WXDRAWITEMSTRUCT;
 typedef void *          WXMEASUREITEMSTRUCT;
 typedef void *          WXLPCREATESTRUCT;