Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Readd mingw32 support

Browse Source 
Clean-up


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Brian Macy
1999-06-02 15:46:54 +00:00
parent 70d1b3cf88
commit 379a3b04b9
1 changed files with 118 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

203
include/wx/msw/winundef.h
View File

@@ -18,173 +18,160 @@
#ifdef GetCharWidth #ifdef GetCharWidth
#undef GetCharWidth #undef GetCharWidth
#endif inline BOOL GetCharWidth(HDC dc, UINT first, UINT last, LPINT buffer)
{
#ifndef __WIN16__ #ifdef _UNICODE
inline BOOL GetCharWidth(HDC dc, UINT first, UINT last, LPINT buffer)
{
#ifdef _UNICODE
return GetCharWidthW(dc, first, last, buffer); return GetCharWidthW(dc, first, last, buffer);
#else #else
return GetCharWidthA(dc, first, last, buffer); return GetCharWidthA(dc, first, last, buffer);
#endif #endif
} }
#endif #endif
// FindWindow // FindWindow
#ifdef FindWindow #ifdef FindWindow
#undef FindWindow #undef FindWindow
#endif #ifdef _UNICODE
inline HWND FindWindow(LPCWSTR classname, LPCWSTR windowname)
#ifndef __WIN16__ {
#ifdef _UNICODE
inline HWND FindWindow(LPCWSTR classname, LPCWSTR windowname)
{
return FindWindowW(classname, windowname); return FindWindowW(classname, windowname);
} }
#else #else
inline HWND FindWindow(LPCSTR classname, LPCSTR windowname) inline HWND FindWindow(LPCSTR classname, LPCSTR windowname)
{ {
return FindWindowA(classname, windowname); return FindWindowA(classname, windowname);
} }
#endif #endif
#endif #endif
// GetClassName // GetClassName
#ifdef GetClassName #ifdef GetClassName
#undef GetClassName #undef GetClassName
#endif #ifdef _UNICODE
inline int GetClassName(HWND h, LPWSTR classname, int maxcount)
#ifndef __WIN16__ {
#ifdef _UNICODE
inline int GetClassName(HWND h, LPWSTR classname, int maxcount)
{
return GetClassNameW(h, classname, maxcount); return GetClassNameW(h, classname, maxcount);
} }
#else #else
inline int GetClassName(HWND h, LPSTR classname, int maxcount) inline int GetClassName(HWND h, LPSTR classname, int maxcount)
{ {
return GetClassNameA(h, classname, maxcount); return GetClassNameA(h, classname, maxcount);
} }
#endif #endif
#endif #endif
// GetClassInfo // GetClassInfo
#ifdef GetClassInfo #ifdef GetClassInfo
#undef GetClassInfo #undef GetClassInfo
#endif #ifdef _UNICODE
inline BOOL GetClassInfo(HINSTANCE h, LPCWSTR name, LPWNDCLASSW winclass)
#ifndef __WIN16__ {
#ifdef _UNICODE
inline BOOL GetClassInfo(HINSTANCE h, LPCWSTR name, LPWNDCLASSW winclass)
{
return GetClassInfoW(h, name, winclass); return GetClassInfoW(h, name, winclass);
} }
#else #else
inline BOOL GetClassInfo(HINSTANCE h, LPCSTR name, LPWNDCLASSA winclass) inline BOOL GetClassInfo(HINSTANCE h, LPCSTR name, LPWNDCLASSA winclass)
{ {
return GetClassInfoA(h, name, winclass); return GetClassInfoA(h, name, winclass);
} }
#endif #endif
#endif #endif
// LoadAccelerators // LoadAccelerators
#ifdef LoadAccelerators #ifdef LoadAccelerators
#undef LoadAccelerators #undef LoadAccelerators
#endif #ifdef _UNICODE
inline HACCEL LoadAccelerators(HINSTANCE h, LPCWSTR name)
#ifndef __WIN16__ {
#ifdef _UNICODE
inline HACCEL LoadAccelerators(HINSTANCE h, LPCWSTR name)
{
return LoadAcceleratorsW(h, name); return LoadAcceleratorsW(h, name);
} }
#else #else
inline HACCEL LoadAccelerators(HINSTANCE h, LPCSTR name) inline HACCEL LoadAccelerators(HINSTANCE h, LPCSTR name)
{ {
return LoadAcceleratorsA(h, name); return LoadAcceleratorsA(h, name);
} }
#endif
#endif #endif
#endif
// GetWindowProc... this isn't a Windows API function?!?!
//ifdef GetWindowProc
// #undef GetWindowProc
//endif
// DrawText // DrawText
#ifdef DrawText #ifdef DrawText
#undef DrawText #undef DrawText
#endif #ifdef _UNICODE
inline int DrawText(HDC h, LPCWSTR str, int count, LPRECT rect, UINT format)
#ifndef __WIN16__ {
#ifdef _UNICODE
inline int DrawText(HDC h, LPCWSTR str, int count, LPRECT rect, UINT format)
{
return DrawTextW(h, str, count, rect, format); return DrawTextW(h, str, count, rect, format);
} }
#else #else
inline int DrawText(HDC h, LPCSTR str, int count, LPRECT rect, UINT format) inline int DrawText(HDC h, LPCSTR str, int count, LPRECT rect, UINT format)
{ {
return DrawTextA(h, str, count, rect, format); return DrawTextA(h, str, count, rect, format);
} }
#endif #endif
#endif #endif
// StartDoc // StartDoc
#ifdef StartDoc #ifdef StartDoc
#undef StartDoc #undef StartDoc
#endif #ifdef _UNICODE
inline int StartDoc(HDC h, CONST DOCINFOW* info)
#ifndef __WIN16__ {
#ifdef _UNICODE
inline int StartDoc(HDC h, CONST DOCINFOW* info)
{
return StartDocW(h, info); return StartDocW(h, info);
} }
#else #else
inline int StartDoc(HDC h, CONST DOCINFOA* info) inline int StartDoc(HDC h, CONST DOCINFOA* info)
{ {
return StartDocA(h, info); return StartDocA(h, info);
} }
#endif
#endif #endif
#endif
// GetFirstChild... not a Windows API Function!?!?!
//ifdef GetFirstChild
// #undef GetFirstChild
//endif
//ifdef GetNextChild
// #undef GetNextChild
//endif
//ifdef GetNextSibling
// #undef GetNextSibling
//endif
// GetObject // GetObject
#ifdef GetObject #ifdef GetObject
#undef GetObject #undef GetObject
inline int GetObject(HGDIOBJ h, int i, LPVOID buffer)
{
#ifdef _UNICODE
return GetObjectW(h, i, buffer);
#else
return GetObjectA(h, i, buffer);
#endif
}
#endif #endif
#ifndef __WIN16__
inline int GetObject(HGDIOBJ h, int i, LPVOID buffer) // For ming and cygwin
{
#ifdef _UNICODE // GetFirstChild
return GetObjectW(h, i, buffer); #ifdef GetFirstChild
#else #undef GetFirstChild
return GetObjectA(h, i, buffer); inline HWND GetFirstChild(HWND h)
{
return GetTopWindow(h);
}
#endif #endif
}
// GetNextSibling
#ifdef GetNextSibling
#undef GetNextSibling
inline HWND GetNextSibling(HWND h)
{
return GetWindow(h, GW_HWNDNEXT);
}
#endif #endif
// GetWindowProc
//ifdef GetWindowProc
// #undef GetWindowProc
//endif
//ifdef GetNextChild
// #undef GetNextChild
//endif
#endif // _WX_WINUNDEF_H_ #endif // _WX_WINUNDEF_H_