From 4286a5b59579f09c014fd81683732cd8609cfe9f Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Wed, 9 Jun 1999 18:09:47 +0000 Subject: [PATCH] The last drops of WINE. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure.in | 18 ++++++++++++++---- include/wx/msw/dcclient.h | 1 + include/wx/msw/window.h | 2 +- src/msw/Makefile.am | 10 +++++++--- src/msw/app.cpp | 5 ++++- src/msw/colordlg.cpp | 2 +- src/msw/dc.cpp | 7 ++++--- src/msw/fontdlg.cpp | 2 +- src/msw/main.cpp | 2 +- src/msw/window.cpp | 8 +++++--- 10 files changed, 39 insertions(+), 18 deletions(-) diff --git a/configure.in b/configure.in index 10f34f4c2f..f850db70ab 100644 --- a/configure.in +++ b/configure.in @@ -951,17 +951,27 @@ if test "$wxUSE_WINE" = 1; then AC_MSG_CHECKING(for Xpm library) WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm) if test "$ac_find_libraries" != "" ; then - WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) - CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link" - XPM_LINK="-lXpm " + GUI_TK_LIBRARY="-L$ac_find_libraries" + XPM_LINK="-lXpm" AC_DEFINE(wxHAVE_LIB_XPM) AC_MSG_RESULT(found at $ac_find_libraries) else AC_MSG_RESULT(no) AC_MSG_WARN(library will be compiled without support for images in XPM format) fi + + MESA_LINK="" + AC_MSG_CHECKING(for Mesa library) + WX_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL) + if test "$ac_find_libraries" != "" ; then + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries" + MESA_LINK="-lMesaGL" + AC_MSG_RESULT(found at $ac_find_libraries) + else + AC_MSG_ERROR(no) + fi - GUI_TK_LINK="-lwine $XPM_LINK -lXmu -lX11 -lm" + GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses -ldl -lm" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" WXWINE=1 TOOLKIT=MSW diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h index e9eaac7776..06288fba28 100644 --- a/include/wx/msw/dcclient.h +++ b/include/wx/msw/dcclient.h @@ -21,6 +21,7 @@ #endif #include "wx/dc.h" +#include "wx/dynarray.h" // ---------------------------------------------------------------------------- // array types diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index be06f8d8b7..8349de73e3 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -20,7 +20,7 @@ #pragma interface "window.h" #endif -#include "wx/msw/winundef.h" +// #include "wx/msw/winundef.h" // VZ: apparently some version of Windows send extra mouse move messages after // a mouse click. My tests under NT 4.0 and 95 didn't show it so I'm diff --git a/src/msw/Makefile.am b/src/msw/Makefile.am index e8295c02f7..9a155b7aa0 100644 --- a/src/msw/Makefile.am +++ b/src/msw/Makefile.am @@ -19,6 +19,7 @@ EXTRA_LTLIBRARIES = libwx_gtk.la libwx_motif.la libwx_msw.la # these are the common files which always make part of the library libwx_msw_la_SOURCES = \ \ + winestub.c \ extended.c \ parser.c \ \ @@ -94,7 +95,6 @@ libwx_msw_la_SOURCES = \ gridg.cpp \ laywin.cpp \ panelg.cpp \ - printps.cpp \ progdlgg.cpp \ prop.cpp \ propform.cpp \ @@ -116,6 +116,7 @@ libwx_msw_la_SOURCES = \ checkbox.cpp \ choice.cpp \ clipbrd.cpp \ + colordlg.cpp \ colour.cpp \ combobox.cpp \ control.cpp \ @@ -127,9 +128,9 @@ libwx_msw_la_SOURCES = \ dcscreen.cpp \ dcprint.cpp \ dialog.cpp \ - dirdlg \ filedlg.cpp \ font.cpp \ + fontdlg.cpp \ frame.cpp \ gauge95.cpp \ gdiobj.cpp \ @@ -145,6 +146,8 @@ libwx_msw_la_SOURCES = \ notebook.cpp \ ownerdrw.cpp \ palette.cpp \ + printdlg.cpp \ + printwin.cpp \ pen.cpp \ radiobox.cpp \ radiobut.cpp \ @@ -166,7 +169,8 @@ libwx_msw_la_SOURCES = \ utils.cpp \ utilsexc.cpp \ wave.cpp \ - window.cpp + window.cpp \ + nativdlg.cpp # these are the sources which we build by our own rules # diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 07a2d29ccd..0c339a6a79 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -43,12 +43,14 @@ #include "wx/msgdlg.h" #include "wx/intl.h" #include "wx/dynarray.h" + #include "wx/wxchar.h" #endif -#include "wx/msw/private.h" #include "wx/log.h" #include "wx/module.h" +#include "wx/msw/private.h" + #if wxUSE_THREADS #include "wx/thread.h" @@ -84,6 +86,7 @@ #include "wx/msw/msvcrt.h" + // --------------------------------------------------------------------------- // global variables // --------------------------------------------------------------------------- diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp index 78a01e7dde..c79f438df9 100644 --- a/src/msw/colordlg.cpp +++ b/src/msw/colordlg.cpp @@ -36,7 +36,7 @@ #include -#if !defined(__WIN32__) || defined(__SALFORDC__) +#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__) #include #endif diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index d1590decfa..c3fb342e01 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -28,10 +28,8 @@ #pragma hdrstop #endif -#include "wx/frame.h" -#include "wx/msw/private.h" - #ifndef WX_PRECOMP + #include "wx/window.h" #include "wx/dc.h" #include "wx/utils.h" #include "wx/dialog.h" @@ -39,6 +37,7 @@ #include "wx/bitmap.h" #include "wx/dcmemory.h" #include "wx/log.h" + #include "wx/icon.h" #endif #include "wx/dcprint.h" @@ -54,6 +53,8 @@ #include #endif +#include "wx/msw/private.h" + #if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) #endif diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp index 6ab94108d0..90886ed197 100644 --- a/src/msw/fontdlg.cpp +++ b/src/msw/fontdlg.cpp @@ -31,7 +31,7 @@ #include -#if !defined(__WIN32__) || defined(__SALFORDC__) +#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__) #include #endif diff --git a/src/msw/main.cpp b/src/msw/main.cpp index 45db41d119..3565e7fa23 100644 --- a/src/msw/main.cpp +++ b/src/msw/main.cpp @@ -40,7 +40,7 @@ #if !defined(_WINDLL) -#ifdef __TWIN32__ +#if defined(__TWIN32__) || defined(__WXWINE__) extern "C" BOOL PASCAL WinMain(HANDLE hInstance, HANDLE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 8da3bb78c9..95424f3bc6 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -2458,13 +2458,13 @@ bool wxWindow::HandleSetCursor(WXHWND hWnd, return FALSE; } -#if wxUSE_OWNER_DRAWN // --------------------------------------------------------------------------- // owner drawn stuff // --------------------------------------------------------------------------- bool wxWindow::MSWOnDrawItem(int id, WXDRAWITEMSTRUCT *itemStruct) { +#if wxUSE_OWNER_DRAWN // is it a menu item? if ( id == 0 ) { @@ -2494,11 +2494,14 @@ bool wxWindow::MSWOnDrawItem(int id, WXDRAWITEMSTRUCT *itemStruct) return ((wxControl *)item)->MSWOnDraw(itemStruct); } else +#endif return FALSE; + } bool wxWindow::MSWOnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct) { +#if wxUSE_OWNER_DRAWN // is it a menu item? if ( id == 0 ) { @@ -2516,10 +2519,9 @@ bool wxWindow::MSWOnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct) { return ((wxControl *)item)->MSWOnMeasure(itemStruct); } - +#endif // owner-drawn menus return FALSE; } -#endif // owner-drawn menus // --------------------------------------------------------------------------- // colours and palettes -- 2.47.2