another makefile updated

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

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index 0b3e1c894fc4f87182b30339a64a03bf7620a56d..046f9431995d0aaa490e4267d8e1aad4755b2bf8 100644 (file)
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -23,6 +23,7 @@
 #include "wx/log.h"
 
 #include "wx/dnd.h"
 #include "wx/log.h"
 
 #include "wx/dnd.h"

+#include "wx/dirdlg.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.


@@ -39,12 +40,7 @@
 // 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
+typedef long wxDropPointCoord;

 
 class DnDText : public wxTextDropTarget
 {
 
 class DnDText : public wxTextDropTarget
 {


@@ -206,80 +202,14 @@ DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
     m_ctrlText  = new wxListBox(this, -1, pos, size, 1, &strText, wxLB_HSCROLL);
 
     m_ctrlLog   = new wxTextCtrl(this, -1, "", pos, size,
     m_ctrlText  = new wxListBox(this, -1, pos, size, 1, &strText, wxLB_HSCROLL);
 
     m_ctrlLog   = new wxTextCtrl(this, -1, "", pos, size,

-            wxTE_MULTILINE | wxTE_READONLY |
-            wxSUNKEN_BORDER );
-
-    // redirect log messages to the text window (don't forget to delete it!)
-    m_pLog = new wxLogTextCtrl(m_ctrlLog);
-    m_pLogPrev = wxLog::SetActiveTarget(m_pLog);
-
-    // associate drop targets with 2 text controls
-    m_ctrlFile->SetDropTarget(new DnDFile(m_ctrlFile));
-    m_ctrlText->SetDropTarget( new DnDText(m_ctrlText) );
-
-    wxLayoutConstraints *c;
-
-    // Top-left listbox
-    c = new wxLayoutConstraints;
-    c->left.SameAs(this, wxLeft);
-    c->top.SameAs(this, wxTop);
-    c->right.PercentOf(this, wxRight, 50);
-    c->height.PercentOf(this, wxHeight, 40);
-    m_ctrlFile->SetConstraints(c);
-
-    // Top-right listbox
-    c = new wxLayoutConstraints;
-    c->left.SameAs    (m_ctrlFile, wxRight);
-    c->top.SameAs     (this, wxTop);
-    c->right.SameAs   (this, wxRight);
-    c->height.PercentOf(this, wxHeight, 40);
-    m_ctrlText->SetConstraints(c);
-
-    // Lower text control
-    c = new wxLayoutConstraints;
-    c->left.SameAs    (this, wxLeft);
-    c->right.SameAs   (this, wxRight);
-    c->height.PercentOf(this, wxHeight, 40);
-    c->top.SameAs(m_ctrlText, wxBottom);
-    m_ctrlLog->SetConstraints(c);
-
-  // construct menu
-  wxMenu *file_menu = new wxMenu;
-  file_menu->Append(Menu_Drag, "&Test drag...");
-  file_menu->AppendSeparator();
-  file_menu->Append(Menu_Quit, "E&xit");
-
-  wxMenu *log_menu = new wxMenu;
-  log_menu->Append(Menu_Clear, "Clear");
-
-  wxMenu *help_menu = new wxMenu;
-  help_menu->Append(Menu_Help, "&Help...");
-  help_menu->AppendSeparator();
-  help_menu->Append(Menu_About, "&About");
-
-  wxMenuBar *menu_bar = new wxMenuBar;
-  menu_bar->Append(file_menu, "&File");
-  menu_bar->Append(log_menu,  "&Log");
-  menu_bar->Append(help_menu, "&Help");
-
-  SetMenuBar(menu_bar);
-
-  // make a panel with 3 subwindows
-  wxPoint pos(0, 0);
-  wxSize  size(400, 200);
-
-  wxString strFile("Drop files here!"), strText("Drop text on me");
-
-  m_ctrlFile  = new wxListBox(this, -1, pos, size, 1, &strFile, wxLB_HSCROLL);
-  m_ctrlText  = new wxListBox(this, -1, pos, size, 1, &strText, wxLB_HSCROLL);
-
-  m_ctrlLog   = new wxTextCtrl(this, -1, "", pos, size,

                                wxTE_MULTILINE | wxTE_READONLY |
                                wxSUNKEN_BORDER );
 
                                wxTE_MULTILINE | wxTE_READONLY |
                                wxSUNKEN_BORDER );
 

-  // redirect log messages to the text window (don't forget to delete it!)
+#if wxUSE_STD_IOSTREAM  
+// redirect log messages to the text window (don't forget to delete it!)

   m_pLog = new wxLogTextCtrl(m_ctrlLog);
   m_pLogPrev = wxLog::SetActiveTarget(m_pLog);
   m_pLog = new wxLogTextCtrl(m_ctrlLog);
   m_pLogPrev = wxLog::SetActiveTarget(m_pLog);

+#endif

 
   // 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));


@@ -427,10 +357,12 @@ void DnDFrame::OnRightDown(wxMouseEvent &event )
 
 DnDFrame::~DnDFrame()
 {
 
 DnDFrame::~DnDFrame()
 {

+#if wxUSE_STD_IOSTREAM  

     if ( m_pLog != NULL ) {
         if ( wxLog::SetActiveTarget(m_pLogPrev) == m_pLog )
             delete m_pLog;
     }
     if ( m_pLog != NULL ) {
         if ( wxLog::SetActiveTarget(m_pLogPrev) == m_pLog )
             delete m_pLog;
     }

+#endif

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -441,18 +373,18 @@ void DnDFrame::OnCopy(wxCommandEvent& WXUNUSED(event))
 {
     if ( !wxTheClipboard->Open() )
     {
 {
     if ( !wxTheClipboard->Open() )
     {

-        wxLogError("Can't open clipboard.");
+        wxLogError(_T("Can't open clipboard."));

 
         return;
     }
 
     if ( !wxTheClipboard->AddData(new wxTextDataObject(m_strText)) )
     {
 
         return;
     }
 
     if ( !wxTheClipboard->AddData(new wxTextDataObject(m_strText)) )
     {

-        wxLogError("Can't copy data to the clipboard");
+        wxLogError(_T("Can't copy data to the clipboard"));

     }
     else
     {
     }
     else
     {

-        wxLogMessage("Text '%s' put on the clipboard", m_strText.c_str());
+        wxLogMessage(_T("Text '%s' put on the clipboard"), m_strText.c_str());

     }
 
     wxTheClipboard->Close();
     }
 
     wxTheClipboard->Close();


@@ -462,14 +394,14 @@ void DnDFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
 {
     if ( !wxTheClipboard->Open() )
     {
 {
     if ( !wxTheClipboard->Open() )
     {

-        wxLogError("Can't open clipboard.");
+        wxLogError(_T("Can't open clipboard."));

 
         return;
     }
 
     if ( !wxTheClipboard->IsSupported(wxDF_TEXT) )
     {
 
         return;
     }
 
     if ( !wxTheClipboard->IsSupported(wxDF_TEXT) )
     {

-        wxLogWarning("No text data on clipboard");
+        wxLogWarning(_T("No text data on clipboard"));

 
         return;
     }
 
         return;
     }


@@ -477,11 +409,11 @@ void DnDFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
     wxTextDataObject text;
     if ( !wxTheClipboard->GetData(&text) )
     {
     wxTextDataObject text;
     if ( !wxTheClipboard->GetData(&text) )
     {

-        wxLogError("Can't paste data from the clipboard");
+        wxLogError(_T("Can't paste data from the clipboard"));

     }
     else
     {
     }
     else
     {

-        wxLogMessage("Text '%s' pasted from the clipboard",
+        wxLogMessage(_T("Text '%s' pasted from the clipboard"),

                      text.GetText().c_str());
     }
 
                      text.GetText().c_str());
     }