// Modified by:
// Created: 16.05.99
// RCS-ID: $Id$
-// Copyright: (c) wxWindows team
+// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// CreateDialog
-//#ifdef(CreateDialog)
-#if !defined(__WXWINCE__) && defined(CreateDialog)
+#if defined(CreateDialog)
#undef CreateDialog
inline HWND CreateDialog(HINSTANCE hInstance,
}
#endif
+// CreateWindow
+
+#if defined(CreateWindow)
+ #undef CreateWindow
+
+ inline HWND CreateWindow(LPCTSTR lpClassName,
+ LPCTSTR lpWndClass,
+ DWORD dwStyle,
+ int x, int y, int w, int h,
+ HWND hWndParent,
+ HMENU hMenu,
+ HINSTANCE hInstance,
+ LPVOID lpParam)
+ {
+ #ifdef _UNICODE
+ return CreateWindowW(lpClassName, lpWndClass, dwStyle, x, y, w, h,
+ hWndParent, hMenu, hInstance, lpParam);
+ #else
+ return CreateWindowA(lpClassName, lpWndClass, dwStyle, x, y, w, h,
+ hWndParent, hMenu, hInstance, lpParam);
+ #endif
+ }
+#endif
+
// LoadMenu
#ifdef LoadMenu
// LoadIcon
#ifdef LoadIcon
#undef LoadIcon
- inline HINSTANCE LoadIcon(HINSTANCE hInstance, LPCTSTR lpIconName)
+ inline HICON LoadIcon(HINSTANCE hInstance, LPCTSTR lpIconName)
{
#ifdef _UNICODE
return LoadIconW(hInstance, lpIconName);
}
#endif // LoadIcon
+// LoadBitmap
+#ifdef LoadBitmap
+ #undef LoadBitmap
+ inline HBITMAP LoadBitmap(HINSTANCE hInstance, LPCTSTR lpBitmapName)
+ {
+ #ifdef _UNICODE
+ return LoadBitmapW(hInstance, lpBitmapName);
+ #else // ANSI
+ return LoadBitmapA(hInstance, lpBitmapName);
+ #endif // Unicode/ANSI
+ }
+#endif // LoadBitmap
// LoadLibrary
#ifdef IsMaximized
#undef IsMaximized
- inline BOOL IsMaximized(HWND hwnd)
+ inline BOOL IsMaximized(HWND WXUNUSED_IN_WINCE(hwnd))
{
+#ifdef __WXWINCE__
+ return FALSE;
+#else
return IsZoomed(hwnd);
+#endif
}
#endif
#ifdef GetFirstChild
#undef GetFirstChild
- inline HWND GetFirstChild(HWND hwnd)
+ inline HWND GetFirstChild(HWND WXUNUSED_IN_WINCE(hwnd))
{
+#ifdef __WXWINCE__
+ return 0;
+#else
return GetTopWindow(hwnd);
+#endif
}
#endif
// For WINE
-#if defined(GetWindowStyle) || defined(__WXWINE__)
+#if defined(GetWindowStyle)
#undef GetWindowStyle
#endif
#if defined(__WXWINCE__) && defined(DrawIcon) //#ifdef DrawIcon
#undef DrawIcon
- inline BOOL DrawIcon(HDC hdc, int x, int y, HICON hicon)
+ inline BOOL DrawIcon(HDC hdc, int x, int y, HICON hicon)
{
return DrawIconEx(hdc,x,y,hicon,0,0,0,NULL, DI_NORMAL) ;
}