wxTipWindow can now derived from wxFrame if not wxUSE_POPUPWIN, or

[wxWidgets.git] / src / mac / dnd.cpp

diff --git a/src/mac/dnd.cpp b/src/mac/dnd.cpp
index ece56ce7d352f24c871a019997c5c9c2c7207ad7..42b397d59031448a039532faf35f513a1b90976a 100644 (file)
--- a/src/mac/dnd.cpp
+++ b/src/mac/dnd.cpp
@@ -39,7 +39,7 @@ wxDropTarget::~wxDropTarget()
 // ----------------------------------------------------------------------------
 // wxTextDropTarget
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTextDropTarget
 // ----------------------------------------------------------------------------

-#ifndef __WXMAC_X__
+#ifndef __DARWIN__

 bool wxTextDropTarget::OnDrop( wxCoord x, wxCoord y, const void *pData )
 {
   OnDropText( x, y, (const char*)pData );
 bool wxTextDropTarget::OnDrop( wxCoord x, wxCoord y, const void *pData )
 {
   OnDropText( x, y, (const char*)pData );


@@ -54,7 +54,7 @@ bool wxTextDropTarget::OnDropText( wxCoord x, wxCoord y, const wxString &psz )
   return TRUE;
 };
 
   return TRUE;
 };
 

-#ifndef __WXMAC_X__
+#ifndef __DARWIN__

 size_t wxTextDropTarget::GetFormatCount() const
 {
   return 1;
 size_t wxTextDropTarget::GetFormatCount() const
 {
   return 1;


@@ -70,7 +70,7 @@ wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const
 // wxFileDropTarget
 // ----------------------------------------------------------------------------
 
 // wxFileDropTarget
 // ----------------------------------------------------------------------------
 

-#ifndef __WXMAC_X__
+#ifndef __DARWIN__

 bool wxFileDropTarget::OnDropFiles( wxCoord x, wxCoord y, size_t nFiles, const char * const WXUNUSED(aszFiles)[] )
 {
   printf( "Got %d dropped files.\n", (int)nFiles );
 bool wxFileDropTarget::OnDropFiles( wxCoord x, wxCoord y, size_t nFiles, const char * const WXUNUSED(aszFiles)[] )
 {
   printf( "Got %d dropped files.\n", (int)nFiles );


@@ -84,7 +84,7 @@ bool wxFileDropTarget::OnDrop(wxCoord x, wxCoord y, const wxArrayString& filenam
   return OnDropFiles(x, y, 1, &filenames); 
 }
 
   return OnDropFiles(x, y, 1, &filenames); 
 }
 

-#ifndef __WXMAC_X__
+#ifndef __DARWIN__

 size_t wxFileDropTarget::GetFormatCount() const
 {
   return 1;
 size_t wxFileDropTarget::GetFormatCount() const
 {
   return 1;