X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62e1ba759a61210a7facf7b9de39fc8bf0f4b479..550f38d74380256da7bfcb961d40ff86f677f77e:/include/wx/msw/microwin.h?ds=sidebyside diff --git a/include/wx/msw/microwin.h b/include/wx/msw/microwin.h index 6f9098c434..35b83275ed 100644 --- 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 @@ -33,7 +33,7 @@ HCURSOR SetCursor(HCURSOR hCursor); 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); @@ -51,7 +51,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, - 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); @@ -73,8 +73,8 @@ 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 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); HBITMAP WINAPI