another wxUSE_DRAG_AND_DROP==0 compilation fix

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

diff --git a/include/wx/msw/microwin.h b/include/wx/msw/microwin.h
index 4bba1f0efe1579550fec90586605985fb1fd64d0..83ef7a3ef10645844d80dcfe2efd5d69394553aa 100644 (file)
--- a/include/wx/msw/microwin.h
+++ b/include/wx/msw/microwin.h
@@ -13,11 +13,6 @@
 #ifndef _WX_MICROWIN_H_
 #define _WX_MICROWIN_H_
 
 #ifndef _WX_MICROWIN_H_
 #define _WX_MICROWIN_H_
 

-#ifdef __GNUG__
-#pragma interface "microwin.h"
-#endif
-
-

 /* Implemented by microwin.cpp */
 
 #ifdef __cplusplus
 /* Implemented by microwin.cpp */
 
 #ifdef __cplusplus


@@ -33,7 +28,7 @@ HCURSOR SetCursor(HCURSOR hCursor);
 int GetScrollPosWX (HWND hWnd, int iSBar);
 
 BOOL ScrollWindow(HWND, int xAmount, int yAmount,
 int GetScrollPosWX (HWND hWnd, int iSBar);
 
 BOOL ScrollWindow(HWND, int xAmount, int yAmount,

-                            CONST RECT* lpRect, CONST RECT* lpClipRect);
+                 CONST RECT* lpRect, CONST RECT* lpClipRect);

 
 HWND WindowFromPoint(POINT pt);
 SHORT GetKeyState(int nVirtKey);
 
 HWND WindowFromPoint(POINT pt);
 SHORT GetKeyState(int nVirtKey);


@@ -51,7 +46,7 @@ COLORREF GetTextColor(HDC hdc);
 COLORREF GetBkColor(HDC hdc);
 HPALETTE SelectPalette(HDC hdc, HPALETTE hPalette, BOOL b);
 BOOL IntersectClipRect(HDC hdc, int x, int y,
 COLORREF GetBkColor(HDC hdc);
 HPALETTE SelectPalette(HDC hdc, HPALETTE hPalette, BOOL b);
 BOOL IntersectClipRect(HDC hdc, int x, int y,

-                      int w, int h);
+               int w, int h);

 BOOL GetClipBox(HDC hdc, RECT* rect);
 BOOL DrawIconEx(HDC hdc, int x, int y, HICON hIcon, int w, int h, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags);
 BOOL SetViewportExtEx(HDC hdc, int x, int y, LPSIZE lpSize);
 BOOL GetClipBox(HDC hdc, RECT* rect);
 BOOL DrawIconEx(HDC hdc, int x, int y, HICON hIcon, int w, int h, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags);
 BOOL SetViewportExtEx(HDC hdc, int x, int y, LPSIZE lpSize);


@@ -73,10 +68,12 @@ BOOL  GetScrollPos (HWND hWnd, int iSBar, int* pPos);
 BOOL  GetScrollRange (HWND hWnd, int iSBar, int* pMinPos, int* pMaxPos);
 BOOL  SetScrollPos (HWND hWnd, int iSBar, int iNewPos);
 BOOL  SetScrollRange (HWND hWnd, int iSBar, int iMinPos, int iMaxPos);
 BOOL  GetScrollRange (HWND hWnd, int iSBar, int* pMinPos, int* pMaxPos);
 BOOL  SetScrollPos (HWND hWnd, int iSBar, int iNewPos);
 BOOL  SetScrollRange (HWND hWnd, int iSBar, int iMinPos, int iMaxPos);

-BOOL  SetScrollInfo (HWND hWnd, int iSBar, 
-                    LPCSCROLLINFO lpsi, BOOL fRedraw);
+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);
 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
 }


@@ -225,11 +222,14 @@ typedef struct tagMINMAXINFO {
 #define VERTSIZE      6     /* Vertical size in millimeters             */
 
 /* Ternary raster operations */
 #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)             */
 #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_ */
 
 #endif /* _WX_MICROWIN_H_ */