implment wxBitmapButton::DoGetBestSize

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

diff --git a/include/wx/msw/microwin.h b/include/wx/msw/microwin.h
index 4bba1f0efe1579550fec90586605985fb1fd64d0..69bb4e13853a6502f411be3c5feeaf7a073a1bf2 100644 (file)
--- a/include/wx/msw/microwin.h
+++ b/include/wx/msw/microwin.h
@@ -13,7 +13,7 @@
 #ifndef _WX_MICROWIN_H_
 #define _WX_MICROWIN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "microwin.h"
 #endif
 
@@ -77,6 +77,8 @@ BOOL  SetScrollInfo (HWND hWnd, int iSBar,
                     LPCSCROLLINFO lpsi, BOOL fRedraw);
 BOOL  GetScrollInfo(HWND hWnd, int iSBar, LPSCROLLINFO lpsi);
 BOOL  ShowScrollBar (HWND hWnd, int iSBar, BOOL bShow);
+HBITMAP WINAPI
+CreateBitmap( int width, int height, int nPlanes, int bPP, LPCVOID lpData);
 
 #ifdef __cplusplus
 }
@@ -225,11 +227,14 @@ typedef struct tagMINMAXINFO {
 #define VERTSIZE      6     /* Vertical size in millimeters             */
 
 /* Ternary raster operations */
+/* Now defined by MicroWindows */
+#if 0
 #define DSTINVERT           (DWORD)0x00550009 /* dest = (NOT dest)               */
 #define WHITENESS           (DWORD)0x00FF0062 /* dest = WHITE                    */
 #define SRCERASE            (DWORD)0x00440328 /* dest = source AND (NOT dest )   */
 #define MERGEPAINT          (DWORD)0x00BB0226 /* dest = (NOT source) OR dest     */
 #define SRCPAINT            (DWORD)0x00EE0086 /* dest = source OR dest           */
 #define NOTSRCCOPY          (DWORD)0x00330008 /* dest = (NOT source)             */
+#endif
 
 #endif /* _WX_MICROWIN_H_ */