Fix to parser.y to make it compile with makefile.unx; wxFileConfig

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

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index 9933d0d3bca9d22c535258fd033b0b928ad6d39b..2d596e27cba029af81e4113849d128dea7880b45 100644 (file)
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -149,7 +149,7 @@ DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
   SetIcon(wxIcon(mondrian_xpm));
 #endif  
   
   SetIcon(wxIcon(mondrian_xpm));
 #endif  
   

-  const int widths[] = { -1 };
+//  const int widths[] = { -1 };

   CreateStatusBar();
 
   // construct menu
   CreateStatusBar();
 
   // construct menu


@@ -192,7 +192,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;
 


@@ -302,11 +302,11 @@ void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) )
     const char *pc;
 
     switch ( dragSource.DoDragDrop(TRUE) ) {
     const char *pc;
 
     switch ( dragSource.DoDragDrop(TRUE) ) {

-      case wxDropSource::Error:   pc = "Error!";    break;
-      case wxDropSource::None:    pc = "Nothing";   break;
-      case wxDropSource::Copy:    pc = "Copied";    break;
-      case wxDropSource::Move:    pc = "Moved";     break;
-      case wxDropSource::Cancel:  pc = "Cancelled"; break;
+      case wxDragError:   pc = "Error!";    break;
+      case wxDragNone:    pc = "Nothing";   break;
+      case wxDragCopy:    pc = "Copied";    break;
+      case wxDragMove:    pc = "Moved";     break;
+      case wxDragCancel:  pc = "Cancelled"; break;

       default:                    pc = "Huh?";      break;
     }
 
       default:                    pc = "Huh?";      break;
     }