Fix crash when editing wxDVC items in place in wxOSX/Cocoa.

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

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index e83f34baa64ec0f1757a3079aada60b2eccc0f24..a3fd4e2ce7a2e32edd3c99e9fe0ee2e49df56578 100644 (file)
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     16.05.99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     16.05.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -27,7 +27,7 @@
 
 // CreateDialog
 
 
 // CreateDialog
 

-#ifdef CreateDialog
+#if defined(CreateDialog)

     #undef CreateDialog
 
     inline HWND CreateDialog(HINSTANCE hInstance,
     #undef CreateDialog
 
     inline HWND CreateDialog(HINSTANCE hInstance,


@@ -43,6 +43,94 @@
     }
 #endif
 
     }
 #endif
 

+// CreateFont
+
+#ifdef CreateFont
+    #undef CreateFont
+
+    inline HFONT CreateFont(int height,
+                            int width,
+                            int escapement,
+                            int orientation,
+                            int weight,
+                            DWORD italic,
+                            DWORD underline,
+                            DWORD strikeout,
+                            DWORD charset,
+                            DWORD outprecision,
+                            DWORD clipprecision,
+                            DWORD quality,
+                            DWORD family,
+                            LPCTSTR facename)
+    {
+        #ifdef _UNICODE
+            return CreateFontW(height, width, escapement, orientation,
+                               weight, italic, underline, strikeout, charset,
+                               outprecision, clipprecision, quality,
+                               family, facename);
+        #else
+            return CreateFontA(height, width, escapement, orientation,
+                               weight, italic, underline, strikeout, charset,
+                               outprecision, clipprecision, quality,
+                               family, facename);
+        #endif
+    }
+#endif // CreateFont
+
+// 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
+    #undef LoadMenu
+
+    inline HMENU LoadMenu(HINSTANCE instance, LPCTSTR name)
+    {
+        #ifdef _UNICODE
+            return LoadMenuW(instance, name);
+        #else
+            return LoadMenuA(instance, name);
+        #endif
+    }
+#endif
+
+// FindText
+
+#ifdef FindText
+    #undef FindText
+
+    inline HWND APIENTRY FindText(LPFINDREPLACE lpfindreplace)
+    {
+        #ifdef UNICODE
+            return FindTextW(lpfindreplace);
+        #else
+            return FindTextA(lpfindreplace);
+        #endif // !UNICODE
+    }
+#endif
+

 // GetCharWidth
 
 #ifdef GetCharWidth
 // GetCharWidth
 
 #ifdef GetCharWidth


@@ -159,6 +247,19 @@
    #endif
 #endif
 
    #endif
 #endif
 

+
+/*
+  When this file is included, sometimes the wxCHECK_W32API_VERSION macro
+  is undefined. With for example CodeWarrior this gives problems with
+  the following code:
+  #if 0 && wxCHECK_W32API_VERSION( 0, 5 )
+  Because CodeWarrior does macro expansion before test evaluation.
+  We define wxCHECK_W32API_VERSION here if it's undefined.
+*/
+#if !defined(__GNUG__) && !defined(wxCHECK_W32API_VERSION)
+    #define wxCHECK_W32API_VERSION(maj, min) (0)
+#endif
+

 // StartDoc
 
 #ifdef StartDoc
 // StartDoc
 
 #ifdef StartDoc


@@ -208,6 +309,32 @@
    }
 #endif
 
    }
 #endif
 

+// LoadIcon
+#ifdef LoadIcon
+    #undef LoadIcon
+    inline HICON LoadIcon(HINSTANCE hInstance, LPCTSTR lpIconName)
+    {
+        #ifdef _UNICODE
+            return LoadIconW(hInstance, lpIconName);
+        #else // ANSI
+            return LoadIconA(hInstance, lpIconName);
+        #endif // Unicode/ANSI
+    }
+#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 LoadLibrary
 // LoadLibrary
 
 #ifdef LoadLibrary


@@ -245,9 +372,13 @@
 
 #ifdef IsMaximized
     #undef IsMaximized
 
 #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);
         return IsZoomed(hwnd);

+#endif

     }
 #endif
 
     }
 #endif
 


@@ -255,9 +386,33 @@
 
 #ifdef GetFirstChild
     #undef GetFirstChild
 
 #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);
         return GetTopWindow(hwnd);

+#endif
+    }
+#endif
+
+// GetFirstSibling
+
+#ifdef GetFirstSibling
+    #undef GetFirstSibling
+    inline HWND GetFirstSibling(HWND hwnd)
+    {
+        return GetWindow(hwnd,GW_HWNDFIRST);
+    }
+#endif
+
+// GetLastSibling
+
+#ifdef GetLastSibling
+    #undef GetLastSibling
+    inline HWND GetLastSibling(HWND hwnd)
+    {
+        return GetWindow(hwnd,GW_HWNDLAST);

     }
 #endif
 
     }
 #endif
 


@@ -283,7 +438,7 @@
 
 // For WINE
 
 
 // For WINE
 

-#if defined(GetWindowStyle) || defined(__WXWINE__)
+#if defined(GetWindowStyle)

   #undef GetWindowStyle
 #endif
 
   #undef GetWindowStyle
 #endif
 


@@ -313,6 +468,16 @@
     #undef Yield
 #endif
 
     #undef Yield
 #endif
 

+
+#if defined(__WXWINCE__) && defined(DrawIcon) //#ifdef DrawIcon
+    #undef DrawIcon
+    inline BOOL DrawIcon(HDC hdc, int x, int y, HICON hicon)
+    {
+        return DrawIconEx(hdc,x,y,hicon,0,0,0,NULL, DI_NORMAL) ;
+    }
+#endif
+
+

 // GetWindowProc
 //ifdef GetWindowProc
 //   #undef GetWindowProc
 // GetWindowProc
 //ifdef GetWindowProc
 //   #undef GetWindowProc