Applied patch [ 856318 ] A few Wine fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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
|
||||
|
@@ -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:
|
||||
|
||||
|
@@ -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!
|
||||
|
@@ -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
|
||||
-----------------------
|
||||
|
||||
|
@@ -1,10 +1,10 @@
|
||||
|
||||
-------------------- High priority ---------------------
|
||||
|
||||
Finish WINE.
|
||||
|
||||
-------------------- Medium priority ---------------------
|
||||
|
||||
|
||||
Fix the configure script to work with Wine.
|
||||
|
||||
-------------------- Low priority ---------------------
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -40,6 +40,9 @@
|
||||
|
||||
extern "C"
|
||||
{
|
||||
#if defined(__WXMSW__)
|
||||
#define XMD_H
|
||||
#endif
|
||||
#include "jpeglib.h"
|
||||
}
|
||||
|
||||
|
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user