[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1410
Date       : Wed Jul  5 18:45:14 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/cartctl.cpp
   M /Trunk/XaraLX/wxOil/ctrllist.cpp
   M /Trunk/XaraLX/wxXtra/Makefile.am
   M /Trunk/XaraLX/wxXtra/manager.cpp
   M /Trunk/XaraLX/wxXtra/wxXtra.h
   D /Trunk/XaraLX/wxXtra/wxmousestate.cpp
   D /Trunk/XaraLX/wxXtra/wxmousestate.h

Remove use of wxmousestate given we require a minimum of wxWidgets 2.6.3


Diff:
Index: Trunk/XaraLX/wxXtra/wxXtra.h
===================================================================
--- Trunk/XaraLX/wxXtra/wxXtra.h	(revision 1409)
+++ Trunk/XaraLX/wxXtra/wxXtra.h	(revision 1410)
@@ -7,7 +7,6 @@
 // by wxstd.h
 
 #include "manager.h"
-#include "wxmousestate.h"
 #include "doublebuffer.h"
 #include "cwfrompoint.h"
 #include "combo.h"
Index: Trunk/XaraLX/wxXtra/manager.cpp
===================================================================
--- Trunk/XaraLX/wxXtra/manager.cpp	(revision 1409)
+++ Trunk/XaraLX/wxXtra/manager.cpp	(revision 1410)
@@ -19,14 +19,7 @@
 #include <wx/minifram.h>
 #include <wx/image.h>
 #include "manager.h"
-#include "wxmousestate.h"
 
-#define WXAUI_USE_WXGETMOUSESTATE 1
-
-#if !defined( WXAUI_USE_WXGETMOUSESTATE ) && defined ( __WXGTK__ )
-extern "C" { void* gdk_window_get_pointer(void*, int*, int*, unsigned int*); }
-#endif
-
 // -- various array and event implementations --
 
 #include <wx/arrimpl.cpp>
@@ -778,25 +771,7 @@
     // functionality to wxWidgets itself)
     static bool isMouseDown()
     {
-#ifdef WXAUI_USE_WXGETMOUSESTATE
-        return wxGetMouseState().LeftDown();
-#else
-        #ifdef __WXMSW__
-        return (GetKeyState( VK_LBUTTON ) & (1<<15)) ? true : false;
-        #endif
-
-        #ifdef __WXGTK__
-        int x, y;
-        unsigned int m;
-        gdk_window_get_pointer(NULL, &x, &y, &m);
-        return (m & 0x100) ? true : false;
-        //return (m & 0x1F00) ? true : false;
-        #endif
-        
-        #ifdef __WXMAC__
-        return GetCurrentButtonState() & 0x01 ;
-        #endif
-#endif
+        return ::wxGetMouseState().LeftDown();
     }
 
 private:
Index: Trunk/XaraLX/wxXtra/Makefile.am
===================================================================
--- Trunk/XaraLX/wxXtra/Makefile.am	(revision 1409)
+++ Trunk/XaraLX/wxXtra/Makefile.am	(revision 1410)
@@ -7,7 +7,7 @@
 
 # the application source, library search path, and link libraries
 libwxXtra_a_SOURCES = \
-	manager.cpp wxmousestate.cpp doublebuffer.cpp cwfrompoint.cpp combo.cpp combog.cpp odcombo.cpp \
+	manager.cpp doublebuffer.cpp cwfrompoint.cpp combo.cpp combog.cpp odcombo.cpp \
 	platform.cpp advsplash.cpp treebook.cpp xh_treebk.cpp
 
 # make sure this does NOT have our include files in the path
Index: Trunk/XaraLX/wxXtra/wxmousestate.cpp (deleted)
===================================================================
Index: Trunk/XaraLX/wxXtra/wxmousestate.h (deleted)
===================================================================
Index: Trunk/XaraLX/wxOil/ctrllist.cpp
===================================================================
--- Trunk/XaraLX/wxOil/ctrllist.cpp	(revision 1409)
+++ Trunk/XaraLX/wxOil/ctrllist.cpp	(revision 1410)
@@ -102,7 +102,6 @@
 #include "cartctl.h"
 #include "cartprov.h"
 #include "dlgevt.h"
-#include "wxmousestate.h"
 #include "dlgmgr.h"
 //#include "bars.h" - in camtypes.h [AUTOMATICALLY REMOVED]
 
Index: Trunk/XaraLX/wxOil/cartctl.cpp
===================================================================
--- Trunk/XaraLX/wxOil/cartctl.cpp	(revision 1409)
+++ Trunk/XaraLX/wxOil/cartctl.cpp	(revision 1410)
@@ -102,7 +102,6 @@
 #include "cartctl.h"
 #include "cartprov.h"
 #include "dlgevt.h"
-#include "wxmousestate.h"
 
 /*****************************************************************************
 


Xara