1. wxMSW::wxNotebook::SetPageSize() and SetPadding() added

[wxWidgets.git] / src / msw / dragimag.cpp

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index 8588617c27025eb394f80063af2f69a41b734b7e..a2793f86bc3a874d61415e9710a71aac5c4a67d3 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -15,6 +15,7 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

+#include "wx/msw/private.h"

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop


@@ -27,6 +28,9 @@
 #include "wx/setup.h"
 #include "wx/window.h"
 #include "wx/dcclient.h"
 #include "wx/setup.h"
 #include "wx/window.h"
 #include "wx/dcclient.h"

+#include "wx/dcscreen.h"
+#include "wx/dcmemory.h"
+#include "wx/settings.h"

 #endif
 
 #include "wx/log.h"
 #endif
 
 #include "wx/log.h"


@@ -35,13 +39,11 @@
 #include "wx/msw/dragimag.h"
 #include "wx/msw/private.h"
 
 #include "wx/msw/dragimag.h"
 #include "wx/msw/private.h"
 

-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)

 #include <commctrl.h>
 #endif
 
 #include <commctrl.h>
 #endif
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxDragImage, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxDragImage, wxObject)

-#endif

 
 wxDragImage::wxDragImage()
 {
 
 wxDragImage::wxDragImage()
 {


@@ -169,11 +171,11 @@ bool wxDragImage::Create(const wxListCtrl& listCtrl, long id)
 // Begin drag
 bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* WXUNUSED(window))
 {
 // Begin drag
 bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* WXUNUSED(window))
 {

-    wxASSERT_MSG( (m_hImageList != 0), "Image list must not be null in BeginDrag.");
+    wxASSERT_MSG( (m_hImageList != 0), wxT("Image list must not be null in BeginDrag."));

 
     bool ret = (ImageList_BeginDrag((HIMAGELIST) m_hImageList, 0, hotspot.x, hotspot.y) != 0);
 
 
     bool ret = (ImageList_BeginDrag((HIMAGELIST) m_hImageList, 0, hotspot.x, hotspot.y) != 0);
 

-    wxASSERT_MSG( (ret), "BeginDrag failed.");
+    wxASSERT_MSG( (ret), wxT("BeginDrag failed."));

 
     if (!ret)
         return FALSE;
 
     if (!ret)
         return FALSE;


@@ -183,7 +185,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* WXUNUSED(window))
         // First add the cursor to the image list
         int cursorIndex = ImageList_AddIcon((HIMAGELIST) m_hImageList, (HICON) m_cursor.GetHCURSOR());
 
         // First add the cursor to the image list
         int cursorIndex = ImageList_AddIcon((HIMAGELIST) m_hImageList, (HICON) m_cursor.GetHCURSOR());
 

-        wxASSERT_MSG( (cursorIndex != -1), "ImageList_AddIcon failed in BeginDrag.");
+        wxASSERT_MSG( (cursorIndex != -1), wxT("ImageList_AddIcon failed in BeginDrag."));

 
         if (cursorIndex != -1)
         {
 
         if (cursorIndex != -1)
         {


@@ -199,7 +201,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* WXUNUSED(window))
 // End drag
 bool wxDragImage::EndDrag(wxWindow* WXUNUSED(window))
 {
 // End drag
 bool wxDragImage::EndDrag(wxWindow* WXUNUSED(window))
 {

-    wxASSERT_MSG( (m_hImageList != 0), "Image list must not be null in EndDrag.");
+    wxASSERT_MSG( (m_hImageList != 0), wxT("Image list must not be null in EndDrag."));

 
     ImageList_EndDrag();
 
 
     ImageList_EndDrag();
 


@@ -212,7 +214,7 @@ bool wxDragImage::EndDrag(wxWindow* WXUNUSED(window))
 // is non-NULL, or in screen coordinates if NULL.
 bool wxDragImage::Move(const wxPoint& pt, wxWindow* window)
 {
 // is non-NULL, or in screen coordinates if NULL.
 bool wxDragImage::Move(const wxPoint& pt, wxWindow* window)
 {

-    wxASSERT_MSG( (m_hImageList != 0), "Image list must not be null in Move.");
+    wxASSERT_MSG( (m_hImageList != 0), wxT("Image list must not be null in Move."));

 
     // TODO: what coordinates are these in: window, client, or screen?
     bool ret = (ImageList_DragMove( pt.x, pt.y ) != 0);
 
     // TODO: what coordinates are these in: window, client, or screen?
     bool ret = (ImageList_DragMove( pt.x, pt.y ) != 0);


@@ -224,7 +226,7 @@ bool wxDragImage::Move(const wxPoint& pt, wxWindow* window)
 
 bool wxDragImage::Show(wxWindow* window)
 {
 
 bool wxDragImage::Show(wxWindow* window)
 {

-    wxASSERT_MSG( (m_hImageList != 0), "Image list must not be null in Show.");
+    wxASSERT_MSG( (m_hImageList != 0), wxT("Image list must not be null in Show."));

 
     HWND hWnd = 0;
     if (window)
 
     HWND hWnd = 0;
     if (window)


@@ -237,7 +239,7 @@ bool wxDragImage::Show(wxWindow* window)
 
 bool wxDragImage::Hide(wxWindow* window)
 {
 
 bool wxDragImage::Hide(wxWindow* window)
 {

-    wxASSERT_MSG( (m_hImageList != 0), "Image list must not be null in Hide.");
+    wxASSERT_MSG( (m_hImageList != 0), wxT("Image list must not be null in Hide."));

 
     HWND hWnd = 0;
     if (window)
 
     HWND hWnd = 0;
     if (window)