1. wxBitmap copy ctor and operator=() taking wxIcon added

[wxWidgets.git] / include / wx / msw / private.h

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index a209ee9ca1485f9d7d3e77991e2860f78537ec02..4c7c5628d983f8b6af720abe63ec5e25511c7357 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -56,7 +56,9 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 // ---------------------------------------------------------------------------
 
 #if defined(__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)
 // ---------------------------------------------------------------------------
 
 #if defined(__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)

+#ifndef ZeroMemory

     inline void ZeroMemory(void *buf, size_t len) { memset(buf, 0, len); }
     inline void ZeroMemory(void *buf, size_t len) { memset(buf, 0, len); }

+#endif

 #endif // old mingw32
 
 // this defines a CASTWNDPROC macro which casts a pointer to the type of a
 #endif // old mingw32
 
 // this defines a CASTWNDPROC macro which casts a pointer to the type of a


@@ -194,28 +196,18 @@ extern LONG APIENTRY _EXPORT
     #define ENDSESSION_LOGOFF    0x80000000
 #endif
 
     #define ENDSESSION_LOGOFF    0x80000000
 #endif
 

-// ---------------------------------------------------------------------------
-// debug messages
-// ---------------------------------------------------------------------------
-#if defined(__WIN95__) && defined(__WXDEBUG__) && wxUSE_DBWIN32
-
-    #ifndef __TWIN32__
-        #ifdef OutputDebugString
-            #undef OutputDebugString
-        #endif
-
-        #define OutputDebugString OutputDebugStringW95
-    #endif // __TWIN32__
-
-    extern void OutputDebugStringW95(const wxChar*, ...);
-#endif // USE_DBWIN32
-

 // ---------------------------------------------------------------------------
 // useful macros and functions
 // ---------------------------------------------------------------------------
 
 // a wrapper macro for ZeroMemory()
 // ---------------------------------------------------------------------------
 // useful macros and functions
 // ---------------------------------------------------------------------------
 
 // a wrapper macro for ZeroMemory()

+#ifdef __WIN32__

 #define wxZeroMemory(obj)   ::ZeroMemory(&obj, sizeof(obj))
 #define wxZeroMemory(obj)   ::ZeroMemory(&obj, sizeof(obj))

+#else
+#define wxZeroMemory(obj)   memset((void*) & obj, 0, sizeof(obj))
+#endif
+
+#include <wx/gdicmn.h>

 
 // make conversion from wxColour and COLORREF a bit less painful
 inline COLORREF wxColourToRGB(const wxColour& c)
 
 // make conversion from wxColour and COLORREF a bit less painful
 inline COLORREF wxColourToRGB(const wxColour& c)