Unicode fixes. Appears that this may be the last before wxMSW will link

[wxWidgets.git] / samples / dnd / dnd.cpp

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index 6014a1b10ad0401352ff6b79065d26faf92e6a71..6a424109219c4ea331aab57d64d82b381f823ec2 100644 (file)
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -9,20 +9,20 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/wxprec.h"
+#include <wx/wxprec.h>

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/wx.h"
+#include <wx/wx.h>

 #endif
 
 #endif
 

-#include  "wx/intl.h"
-#include  "wx/log.h"
+#include <wx/intl.h>
+#include <wx/log.h>

 
 

-#include  "wx/dnd.h"
+#include <wx/dnd.h>

 
 #ifdef __WXMOTIF__
 #error Sorry, drag and drop is not yet implemented on wxMotif.
 
 #ifdef __WXMOTIF__
 #error Sorry, drag and drop is not yet implemented on wxMotif.


@@ -37,12 +37,19 @@
 // file names) we drop on them
 // ----------------------------------------------------------------------------
 
 // file names) we drop on them
 // ----------------------------------------------------------------------------
 

+// FIXME this is ugly and should be fixed in the library itself
+#ifdef __WXMSW__
+    typedef long wxDropPointCoord;
+#else // wxGTK
+    typedef int wxDropPointCoord;
+#endif // MSW/GTK
+

 class DnDText : public wxTextDropTarget
 {
 public:
   DnDText(wxListBox *pOwner) { m_pOwner = pOwner; }
 
 class DnDText : public wxTextDropTarget
 {
 public:
   DnDText(wxListBox *pOwner) { m_pOwner = pOwner; }
 

-  virtual bool OnDropText(int x, int y, const wxChar* psz );
+  virtual bool OnDropText(wxDropPointCoord x, wxDropPointCoord y, const wxChar* psz );

 
 private:
   wxListBox *m_pOwner;
 
 private:
   wxListBox *m_pOwner;


@@ -53,7 +60,7 @@ class DnDFile : public wxFileDropTarget
 public:
   DnDFile(wxListBox *pOwner) { m_pOwner = pOwner; }
 
 public:
   DnDFile(wxListBox *pOwner) { m_pOwner = pOwner; }
 

-  virtual bool OnDropFiles(int x, int y,
+  virtual bool OnDropFiles(wxDropPointCoord x, wxDropPointCoord y,

                            size_t nFiles, const wxChar* const aszFiles[] );
 
 private:
                            size_t nFiles, const wxChar* const aszFiles[] );
 
 private:


@@ -195,7 +202,7 @@ DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
 
   // associate drop targets with 2 text controls
   m_ctrlFile->SetDropTarget(new DnDFile(m_ctrlFile));
 
   // associate drop targets with 2 text controls
   m_ctrlFile->SetDropTarget(new DnDFile(m_ctrlFile));

-  m_ctrlText->SetDropTarget( new DnDText(m_ctrlText) );
+  m_ctrlText->SetDropTarget(new DnDText(m_ctrlText));

 
   wxLayoutConstraints *c;
 
 
   wxLayoutConstraints *c;
 


@@ -349,14 +356,14 @@ DnDFrame::~DnDFrame()
 // ----------------------------------------------------------------------------
 // Notifications called by the base class
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Notifications called by the base class
 // ----------------------------------------------------------------------------

-bool DnDText::OnDropText( int, int, const wxChar *psz )
+bool DnDText::OnDropText( wxDropPointCoord, wxDropPointCoord, const wxChar *psz )

 {
   m_pOwner->Append(psz);
 
   return TRUE;
 }
 
 {
   m_pOwner->Append(psz);
 
   return TRUE;
 }
 

-bool DnDFile::OnDropFiles( int, int, size_t nFiles,
+bool DnDFile::OnDropFiles( wxDropPointCoord, wxDropPointCoord, size_t nFiles,

                            const wxChar* const aszFiles[])
 {
   wxString str;
                            const wxChar* const aszFiles[])
 {
   wxString str;