Reenabled OSS support

[wxWidgets.git] / utils / dialoged / src / dlghndlr.cpp

diff --git a/utils/dialoged/src/dlghndlr.cpp b/utils/dialoged/src/dlghndlr.cpp
index ba3be91fd94fe819d9a00647983c339d3761c7b5..721af4b4b0de206c751a8d75397636562af821c8 100644 (file)
--- a/utils/dialoged/src/dlghndlr.cpp
+++ b/utils/dialoged/src/dlghndlr.cpp
@@ -29,16 +29,6 @@
 #include <math.h>
 #include <string.h>
 
-#if wxUSE_IOSTREAMH
-#if defined(__WXMSW__) && !defined(__GNUWIN32__)
-#include <strstrea.h>
-#else
-#include <strstream.h>
-#endif
-#else
-#include <strstream>
-#endif
-
 #include "reseditr.h"
 #include "winprop.h"
 #include "dlghndlr.h"
@@ -341,8 +331,8 @@ void wxResourceEditorDialogHandler::OnMouseEvent(wxMouseEvent& event)
       return;
     }
   
-    long x, y;
-    event.Position(&x, &y);
+    wxCoord x, y;
+    event.GetPosition(&x, &y);
 
     // Find which selection handle we're on, if any
     wxNode *node = handlerDialog->GetChildren().First();
@@ -411,7 +401,7 @@ void wxResourceEditorDialogHandler::OnItemEvent(wxControl *item, wxMouseEvent& e
 
   // Not a selection handle event: just a normal item event.
   // Transform to panel coordinates.
-  int x, y;
+  wxCoord x, y;
   item->GetPosition(&x, &y);
 
   event.m_x = event.m_x + x;
@@ -424,8 +414,8 @@ void wxResourceEditorDialogHandler::ProcessItemEvent(wxControl *item, wxMouseEve
 {
   wxResourceEditorControlHandler *childHandler = (wxResourceEditorControlHandler *)item->GetEventHandler();
   
-  long x, y;
-  event.Position(&x, &y);
+  wxCoord x, y;
+  event.GetPosition(&x, &y);
   int keys = 0;
   if (event.ShiftDown()) keys = keys | wxKEY_SHIFT;
   if (event.ControlDown()) keys = keys | wxKEY_CTRL;
@@ -784,7 +774,7 @@ void wxResourceEditorControlHandler::OnDragBegin(int x, int y, int WXUNUSED(keys
 
   dc.SetOptimization(FALSE);
 
-  dc.SetLogicalFunction(wxXOR);
+  dc.SetLogicalFunction(wxINVERT);
 
   wxPen pen(wxColour(0, 0, 0), 1, wxDOT);
   dc.SetPen(pen);
@@ -902,7 +892,7 @@ void wxResourceEditorControlHandler::OnDragContinue(bool WXUNUSED(paintIt), int
     }
     dc.BeginDrawing();
 
-    dc.SetLogicalFunction(wxXOR);
+    dc.SetLogicalFunction(wxINVERT);
     wxPen pen(wxColour(0, 0, 0), 1, wxDOT);
     dc.SetPen(pen);
     dc.SetBrush(* wxTRANSPARENT_BRUSH);
@@ -914,7 +904,7 @@ void wxResourceEditorControlHandler::OnDragContinue(bool WXUNUSED(paintIt), int
   else
   {
       dc.BeginDrawing();
-      dc.SetLogicalFunction(wxXOR);
+      dc.SetLogicalFunction(wxINVERT);
       wxPen pen(wxColour(0, 0, 0), 1, wxDOT);
       dc.SetPen(pen);
       dc.SetBrush(* wxTRANSPARENT_BRUSH);