Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/msw/microwin.h b/include/wx/msw/microwin.h
index 6f9098c434bd11afec3157d24c7b518cb3b8bbfa..206ce59131a13bb34560d516d69b8d05bfae0779 100644 (file)
--- a/include/wx/msw/microwin.h
+++ b/include/wx/msw/microwin.h
@@ -1,6 +1,6 @@
 /*
 /////////////////////////////////////////////////////////////////////////////
-// Name:        microwin.h
+// Name:        wx/msw/microwin.h
 // Purpose:     Extra implementation for MicroWindows
 // Author:      Julian Smart
 // Created:     2001-05-31
@@ -13,11 +13,6 @@
 #ifndef _WX_MICROWIN_H_
 #define _WX_MICROWIN_H_
 
-#ifdef __GNUG__
-#pragma interface "microwin.h"
-#endif
-
-
 /* 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,
-                            CONST RECT* lpRect, CONST RECT* lpClipRect);
+                 CONST RECT* lpRect, CONST RECT* lpClipRect);
 
 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,
-                      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 +68,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