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
#endif
#include "wx/dc.h"
+#include "wx/dynarray.h"
// ----------------------------------------------------------------------------
// array types
#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
# these are the common files which always make part of the library
libwx_msw_la_SOURCES = \
\
+ winestub.c \
extended.c \
parser.c \
\
gridg.cpp \
laywin.cpp \
panelg.cpp \
- printps.cpp \
progdlgg.cpp \
prop.cpp \
propform.cpp \
checkbox.cpp \
choice.cpp \
clipbrd.cpp \
+ colordlg.cpp \
colour.cpp \
combobox.cpp \
control.cpp \
dcscreen.cpp \
dcprint.cpp \
dialog.cpp \
- dirdlg \
filedlg.cpp \
font.cpp \
+ fontdlg.cpp \
frame.cpp \
gauge95.cpp \
gdiobj.cpp \
notebook.cpp \
ownerdrw.cpp \
palette.cpp \
+ printdlg.cpp \
+ printwin.cpp \
pen.cpp \
radiobox.cpp \
radiobut.cpp \
utils.cpp \
utilsexc.cpp \
wave.cpp \
- window.cpp
+ window.cpp \
+ nativdlg.cpp
# these are the sources which we build by our own rules
#
#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"
#include "wx/msw/msvcrt.h"
+
// ---------------------------------------------------------------------------
// global variables
// ---------------------------------------------------------------------------
#include <windows.h>
-#if !defined(__WIN32__) || defined(__SALFORDC__)
+#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)
#include <commdlg.h>
#endif
#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"
#include "wx/bitmap.h"
#include "wx/dcmemory.h"
#include "wx/log.h"
+ #include "wx/icon.h"
#endif
#include "wx/dcprint.h"
#include <print.h>
#endif
+#include "wx/msw/private.h"
+
#if !USE_SHARED_LIBRARY
IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
#endif
#include <windows.h>
-#if !defined(__WIN32__) || defined(__SALFORDC__)
+#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)
#include <commdlg.h>
#endif
#if !defined(_WINDLL)
-#ifdef __TWIN32__
+#if defined(__TWIN32__) || defined(__WXWINE__)
extern "C"
BOOL PASCAL WinMain(HANDLE hInstance, HANDLE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
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 )
{
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 )
{
{
return ((wxControl *)item)->MSWOnMeasure(itemStruct);
}
-
+#endif // owner-drawn menus
return FALSE;
}
-#endif // owner-drawn menus
// ---------------------------------------------------------------------------
// colours and palettes