- Modify #if to include wxCocoa as a platform using wxBitmapBase

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

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 094ab1fcd12f437c4327476ca0280637ad2056d1..a1308f5b479de9772c16cf9b5b70e615a5ceec9f 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -20,6 +20,13 @@
 
 #include <windows.h>
 
 
 #include <windows.h>
 

+
+#if defined (__WXWINCE__)
+    #include <wingdi.h>     // RGB, COLORREF
+    #include <winuser.h>    // Global Namespaces ::GetKeyState, ::GetWindowRect
+#endif
+
+

 #ifdef __WXMICROWIN__
     // Extra prototypes and symbols not defined by MicroWindows
     #include "wx/msw/microwin.h"
 #ifdef __WXMICROWIN__
     // Extra prototypes and symbols not defined by MicroWindows
     #include "wx/msw/microwin.h"


@@ -206,6 +213,7 @@ extern LONG APIENTRY _EXPORT
 #if wxUSE_GUI
 
 #include <wx/gdicmn.h>
 #if wxUSE_GUI
 
 #include <wx/gdicmn.h>

+#include <wx/colour.h>

 
 // make conversion from wxColour and COLORREF a bit less painful
 inline COLORREF wxColourToRGB(const wxColour& c)
 
 // make conversion from wxColour and COLORREF a bit less painful
 inline COLORREF wxColourToRGB(const wxColour& c)


@@ -339,6 +347,8 @@ public:
 
 private:
     HDC m_hdc;
 
 private:
     HDC m_hdc;

+
+    DECLARE_NO_COPY_CLASS(ScreenHDC)

 };
 
 // the same as ScreenHDC but for memory DCs: creates the HDC in ctor and
 };
 
 // the same as ScreenHDC but for memory DCs: creates the HDC in ctor and


@@ -347,12 +357,14 @@ class MemoryHDC
 {
 public:
     MemoryHDC() { m_hdc = ::CreateCompatibleDC(NULL); }
 {
 public:
     MemoryHDC() { m_hdc = ::CreateCompatibleDC(NULL); }

-   ~MemoryHDC() { ::DeleteObject(m_hdc);              }
+   ~MemoryHDC() { ::DeleteDC(m_hdc);                  }

 
     operator HDC() const { return m_hdc; }
 
 private:
     HDC m_hdc;
 
     operator HDC() const { return m_hdc; }
 
 private:
     HDC m_hdc;

+
+    DECLARE_NO_COPY_CLASS(MemoryHDC)

 };
 
 // a class which selects a GDI object into a DC in its ctor and deselects in
 };
 
 // a class which selects a GDI object into a DC in its ctor and deselects in


@@ -371,6 +383,8 @@ public:
 private:
    HDC m_hdc;
    HGDIOBJ m_hgdiobj;
 private:
    HDC m_hdc;
    HGDIOBJ m_hgdiobj;

+
+    DECLARE_NO_COPY_CLASS(SelectInHDC)

 };
 
 // ---------------------------------------------------------------------------
 };
 
 // ---------------------------------------------------------------------------