* Made GSocket::GetError() exp/imp from net library and provide an inline

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

diff --git a/include/wx/msw/microwin.h b/include/wx/msw/microwin.h
index 2ea902ceb67d87cc3810edc55e5ed6b3e8cc95d6..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_
 
 #ifndef _WX_MICROWIN_H_
 #define _WX_MICROWIN_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "microwin.h"
 #endif
 
 #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);
                     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
 }
 
 #ifdef __cplusplus
 }