Applied patch [ 856318 ] A few Wine fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/animate/animate.cpp b/contrib/src/animate/animate.cpp
index ec393517d37eee941aae7345dc7329935f2601b9..a334227ce1aea41bd52ce94b1ba75ffd45e9510c 100644 (file)
--- a/contrib/src/animate/animate.cpp
+++ b/contrib/src/animate/animate.cpp
@@ -22,11 +22,11 @@
 #include "wx/wfstream.h"
 #include "wx/image.h"
 #include "wx/gifdecod.h"
-#include "wx/animate/animate.h"
 #include "wx/log.h"
+#include "wx/dcmemory.h"
+#include "wx/animate/animate.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
-#include "wx/dcmemory.h"
 
 /*
  * wxAnimationPlayer

diff --git a/docs/changes.txt b/docs/changes.txt
index 4d3166f5804bd868549ff6e2a165b0e541ca8cff..9b415b2ae4d22249e00c5c6af43603805e1571c3 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -122,6 +122,7 @@ wxGTK:
 - fixed wxChoice::Delete() in presence of client data
 - allow calling wxWindow::SetFont if window not yet created
 - use same average character width as other ports when calculating dialog units
+- fixed mouse wheel handling under GTK2 (Hugh Fisher)
 
 wxMac:
 

diff --git a/docs/toback24.txt b/docs/toback24.txt
index ad9271156ba6360b7feec12cb2f88141c8538628..2e56e8c7ac37fe9710c49a132235ce838bca1eab 100644 (file)
--- a/docs/toback24.txt
+++ b/docs/toback24.txt
@@ -59,15 +59,6 @@ Checking in docs/changes.txt;
 /pack/cvsroots/wxwindows/wxWindows/docs/changes.txt,v  <--  changes.txt
 new revision: 1.266; previous revision: 1.265
 
-7. use one gdk_draw_lines() call instead of multiple gdk_draw_line() ones
-
-http://sf.net/tracker/index.php?func=detail&aid=717012&group_id=9863&atid=309863
-
-Checking in src/gtk/dcclient.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/gtk/dcclient.cpp,v  <--  dcclient.cpp
-new revision: 1.169; previous revision: 1.168
-
-
 8. UnixWare compilation fixes:
 
 Don't forget to rerun autoconf to regenerate configure!

diff --git a/docs/wine/install.txt b/docs/wine/install.txt
index 29fc50154b98bcf5dbcc006b7f418db3e7c8e57c..aa28dd8c58ab64f04371e7f84558bc252b963b98 100644 (file)
--- a/docs/wine/install.txt
+++ b/docs/wine/install.txt
@@ -1,33 +1,4 @@
 
-  !!! When sending bug reports tell us what version of wxWindows you are 
-      using (including the beta) and what compiler on what system. One 
-      example: wxWINE 2.1 snapshot 6, egcs 1.1.1, Redhat 5.0 !!!
-
-* Preparing WINE
-----------------
-
-Most C++ compilers cannot compile the WINE sources yet (this includes
-all versions of g++ and egcs) so you have to make a minimal change
-and recompile all of WINE in order to get anywhere.
-
-(Note: this information may be out of date now. See notes at
-the bottom of this file.)
-
-This change has do be applied to the /include/windef.h file, line 59
-in the section "Calling convention definitions", where the sources
-reads:
-
-#if __i386__
-
-which has to be changed into
-
-#if 0
-
-After this change, you'll have to recompile all of WINE without
-forgetting to install it. The direct consequence of this change
-is that the Win32 binary emulator won't work anymore, as the
-change disables the Windows native calling convention.
-
 * The most simple case
 -----------------------
 

diff --git a/docs/wine/todo.txt b/docs/wine/todo.txt
index 188d0fabe468ac1fb4db498e3652e914b69ba099..8408a5be0d37f1e9056234ba6d4789a76cdc3ac0 100644 (file)
--- a/docs/wine/todo.txt
+++ b/docs/wine/todo.txt
@@ -1,10 +1,10 @@
 
 -------------------- High priority ---------------------
 
-Finish WINE.
 
 -------------------- Medium priority ---------------------
 
-  
+Fix the configure script to work with Wine.  
+
 -------------------- Low priority ---------------------
     

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 9bd8866cbfd4112f86c319afb10979d8cc0220e5..7fc9a996de63d358f24f24aa78383dc27f2e02ed 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -26,7 +26,7 @@
 #endif
 
 #ifndef wxUSE_NORLANDER_HEADERS
-#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1200)) || ((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))))
+#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1200)) || defined(__WINE__) || ((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))))
 #   define wxUSE_NORLANDER_HEADERS 1
 #else
 #   define wxUSE_NORLANDER_HEADERS 0

diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index 7590cee41733d8362dd54e5a656d8f35642e9b92..d2d50a0e5d8e9104a95ea0eea1e64b3c30f1f82d 100644 (file)
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -40,6 +40,9 @@
 
 extern "C"
 {
+    #if defined(__WXMSW__)
+        #define XMD_H
+    #endif
     #include "jpeglib.h"
 }
 

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index d0cd68798c9b32ffc148ad2326a436bd14480a5b..1a6fcd064b6467cac59156d907a4004500b24b86 100644 (file)
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -250,7 +250,7 @@ wxLongLong wxGetLocalTimeMillis()
     // If possible, use a function which avoids conversions from
     // broken-up time structures to milliseconds
 
-#if defined(__WXMSW__) && defined(__MWERKS__)
+#if defined(__WXMSW__) && (defined(__WINE__) || defined(__MWERKS__))
     // This should probably be the way all WXMSW compilers should do it
     // Go direct to the OS for time