From c67d6888d421207045dc6ce9c9762727118c92e2 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 28 Nov 2001 18:22:16 +0000 Subject: [PATCH] Fixing wxMicroWindows compilation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/microwin/readme.txt | 5 +- include/wx/dialog.h | 2 +- include/wx/frame.h | 2 +- include/wx/longlong.h | 2 +- include/wx/msw/microwin.h | 3 + include/wx/msw/setup_microwin.h | 1207 +++++++++++++++++++++++++++++++ samples/minimal/makefile.mic | 2 +- src/common/filefn.cpp | 6 +- src/common/filename.cpp | 4 +- src/common/imagxpm.cpp | 2 + src/common/intl.cpp | 4 +- src/common/quantize.cpp | 2 +- src/common/utilscmn.cpp | 3 + src/generic/spinctlg.cpp | 3 + src/msw/app.cpp | 4 +- src/msw/dc.cpp | 2 +- src/msw/dialog.cpp | 2 +- src/msw/makefile.mic | 16 +- src/msw/region.cpp | 5 + src/msw/toplevel.cpp | 2 +- src/msw/window.cpp | 4 + 21 files changed, 1261 insertions(+), 21 deletions(-) create mode 100644 include/wx/msw/setup_microwin.h diff --git a/docs/microwin/readme.txt b/docs/microwin/readme.txt index 1e6152714c..2760e3bc55 100644 --- a/docs/microwin/readme.txt +++ b/docs/microwin/readme.txt @@ -45,7 +45,10 @@ MicroWindows: wxMicroWindows: -- untar the wxMicroWindows port/download from CVS +- Download wxMSW 2.3.3 or greater, or get it from CVS + +- Copy include/wx/msw/setup_microwin.h to include/wx/setup.h if + include/wx/setup.h doesn't exist - change the TOP variable at the top of src/msw/makefile.mic to reflect where MicroWindows is installed diff --git a/include/wx/dialog.h b/include/wx/dialog.h index cfab0663ad..7146986a5e 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -62,7 +62,7 @@ protected: }; -#if defined(__WXUNIVERSAL__) +#if defined(__WXUNIVERSAL__) && !defined(__WXMICROWIN__) #include "wx/univ/dialog.h" #else #if defined(__WXMSW__) diff --git a/include/wx/frame.h b/include/wx/frame.h index aaec9eba95..2fa2d92fec 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -203,7 +203,7 @@ protected: }; // include the real class declaration -#ifdef __WXUNIVERSAL__ +#if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__) #include "wx/univ/frame.h" #else // !__WXUNIVERSAL__ #if defined(__WXMSW__) diff --git a/include/wx/longlong.h b/include/wx/longlong.h index 07d8ca4342..b721feef53 100644 --- a/include/wx/longlong.h +++ b/include/wx/longlong.h @@ -57,7 +57,7 @@ #define wxLongLong_t __int64 #elif defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8 #define wxLongLong_t long long -#elif defined(__MINGW32__) || defined(__CYGWIN__) +#elif defined(__MINGW32__) || defined(__CYGWIN__) || defined(__WXMICROWIN__) #define wxLongLong_t long long #elif defined(__MWERKS__) #if __option(longlong) diff --git a/include/wx/msw/microwin.h b/include/wx/msw/microwin.h index 4bba1f0efe..2ea902ceb6 100644 --- a/include/wx/msw/microwin.h +++ b/include/wx/msw/microwin.h @@ -225,11 +225,14 @@ typedef struct tagMINMAXINFO { #define VERTSIZE 6 /* Vertical size in millimeters */ /* Ternary raster operations */ +/* Now defined by MicroWindows */ +#if 0 #define DSTINVERT (DWORD)0x00550009 /* dest = (NOT dest) */ #define WHITENESS (DWORD)0x00FF0062 /* dest = WHITE */ #define SRCERASE (DWORD)0x00440328 /* dest = source AND (NOT dest ) */ #define MERGEPAINT (DWORD)0x00BB0226 /* dest = (NOT source) OR dest */ #define SRCPAINT (DWORD)0x00EE0086 /* dest = source OR dest */ #define NOTSRCCOPY (DWORD)0x00330008 /* dest = (NOT source) */ +#endif #endif /* _WX_MICROWIN_H_ */ diff --git a/include/wx/msw/setup_microwin.h b/include/wx/msw/setup_microwin.h new file mode 100644 index 0000000000..3a80e8aef4 --- /dev/null +++ b/include/wx/msw/setup_microwin.h @@ -0,0 +1,1207 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/msw/setup.h +// Purpose: Configuration for the library +// Author: Julian Smart +// Modified by: +// Created: 01/02/97 +// RCS-ID: $Id$ +// Copyright: (c) Julian Smart +// Licence: wxWindows license +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_SETUP_H_ +#define _WX_SETUP_H_ + +// ---------------------------------------------------------------------------- +// global settings +// ---------------------------------------------------------------------------- + +//#define WXWIN_OS_DESCRIPTION wxT("MicroWindows") + +// define this to 0 when building wxBase library - this can also be done from +// makefile/project file overriding the value here +#ifndef wxUSE_GUI + #define wxUSE_GUI 1 +#endif // wxUSE_GUI + +// ---------------------------------------------------------------------------- +// compatibility settings +// ---------------------------------------------------------------------------- + +// This setting determines the compatibility with 1.68 API: +// Level 0: no backward compatibility, all new features +// Level 1: some extra methods are defined for compatibility. +// +// Default is 0. +// +// Recommended setting: 0 (in fact the compatibility code is now very minimal +// so there is little advantage to setting it to 1. +#define WXWIN_COMPATIBILITY 0 + +// This setting determines the compatibility with 2.0 API: set it to 1 to +// enable it +// +// Default is 0. +// +// Recommended setting: 0 (please update your code instead!) +#define WXWIN_COMPATIBILITY_2 0 + +// This setting determines the compatibility with 2.0 API: set it to 1 to +// enable it +// +// Default is 0. +// +// Recommended setting: 0 (please update your code instead!) +#define WXWIN_COMPATIBILITY_2_2 0 + +// in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap, +// but this is very dangerous because you can mistakenly pass an icon instead +// of a bitmap to a function taking "const wxBitmap&" - which will *not* work +// because an icon is not a valid bitmap +// +// Starting from 2.1.12, you have the choice under this backwards compatible +// behaviour (your code will still compile, but probably won't behave as +// expected!) and not deriving wxIcon class from wxBitmap, but providing a +// conversion ctor wxBitmap(const wxIcon&) instead. +// +// Recommended setting: 0 +#define wxICON_IS_BITMAP 0 + +// Define as 1 for font size to be backward compatible to 1.63 and earlier. +// 1.64 and later define point sizes to be compatible with Windows. +// +// Default is 0 +// +// Recommended setting: 0 +#define wxFONT_SIZE_COMPATIBILITY 0 + +// Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before. +// If migrating between versions, your dialogs may seem to shrink. +// +// Default is 1 +// +// Recommended setting: 0 (the new calculations are more correct!) +#define wxDIALOG_UNIT_COMPATIBILITY 1 + +// ---------------------------------------------------------------------------- +// debugging settings +// ---------------------------------------------------------------------------- + +// Generic comment about debugging settings: they are very useful if you don't +// use any other memory leak detection tools such as Purify/BoundsChecker, but +// are probably redundant otherwise. Also, Visual C++ CRT has the same features +// as wxWindows memory debugging subsystem built in since version 5.0 and you +// may prefer to use it instead of built in memory debugging code because it is +// faster and more fool proof. +// +// Using VC++ CRT memory debugging is enabled by default in debug mode +// (__WXDEBUG__) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0) +// and if __NO_VC_CRTDBG__ is not defined. + +// If 1, enables wxDebugContext, for writing error messages to file, etc. If +// __WXDEBUG__ is not defined, will still use normal memory operators. It's +// recommended to set this to 1, since you may well need to output an error log +// in a production version (or non-debugging beta). +// +// Default is 1. +// +// Recommended setting: 1 but see comment above +#define wxUSE_DEBUG_CONTEXT 1 + +// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF* +// __WXDEBUG__ is also defined. +// +// WARNING: this code may not work with all architectures, especially if +// alignment is an issue. This switch is currently ignored for mingw / cygwin +// +// Default is 1 +// +// Recommended setting: 1 but see comment in the beginning of this section +#define wxUSE_MEMORY_TRACING 1 + +// In debug mode, cause new and delete to be redefined globally. +// If this causes problems (e.g. link errors), set this to 0. +// This switch is currently ignored for mingw / cygwin +// +// Default is 1 +// +// Recommended setting: 1 but see comment in the beginning of this section +#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 + +// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If +// this causes problems (e.g. link errors), set this to 0. You may need to set +// this to 0 if using templates (at least for VC++). This switch is currently +// ignored for mingw / cygwin +// +// Default is 1 +// +// Recommended setting: 1 but see comment in the beginning of this section +#define wxUSE_DEBUG_NEW_ALWAYS 0 + +// wxHandleFatalExceptions() may be used to catch the program faults at run +// time and, instead of terminating the program with a usual GPF message box, +// call the user-defined wxApp::OnFatalException() function. If you set +// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work. +// +// This setting is for Win32 only and can only be enabled if your compiler +// supports Win32 structured exception handling (currently only VC++ does) +// +// Default is 1 +// +// Recommended setting: 1 if your compiler supports it. +#ifdef _MSC_VER + #define wxUSE_ON_FATAL_EXCEPTION 1 +#else + #define wxUSE_ON_FATAL_EXCEPTION 0 +#endif + +// ---------------------------------------------------------------------------- +// Unicode support +// ---------------------------------------------------------------------------- + +// Set wxUSE_UNICODE to 1 to compile wxWindows in Unicode mode: wxChar will be +// defined as wchar_t, wxString will use Unicode internally. If you set this +// to 1, you must use wxT() macro for all literal strings in the program. +// +// Unicode is currently only fully supported under Windows NT/2000 (Windows 9x +// doesn't support it and the programs compiled in Unicode mode will not run +// under 9x). +// +// Default is 0 +// +// Recommended setting: 0 (unless you only plan to use Windows NT/2000) +#define wxUSE_UNICODE 0 + +// Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without +// compiling the program in Unicode mode. More precisely, it will be possible +// to construct wxString from a wide (Unicode) string and convert any wxString +// to Unicode. +// +// Default is 1 +// +// Recommended setting: 1 +#define wxUSE_WCHAR_T 0 + +// ---------------------------------------------------------------------------- +// global features +// ---------------------------------------------------------------------------- + +// Support for message/error logging. This includes wxLogXXX() functions and +// wxLog and derived classes. Don't set this to 0 unless you really know what +// you are doing. +// +// Default is 1 +// +// Recommended setting: 1 (always) +#define wxUSE_LOG 1 + +// Support for command line parsing using wxCmdLineParser class. +// +// Default is 1 +// +// Recommended setting: 1 (can be set to 0 if you don't use the cmd line) +#define wxUSE_CMDLINE_PARSER 1 + +// Recommended setting: 1 +#define wxUSE_LOGWINDOW 1 + +// Recommended setting: 1 +#define wxUSE_LOGGUI 1 + +// Recommended setting: 1 +#define wxUSE_LOG_DIALOG 0 + +// Support for multithreaded applications: if 1, compile in thread classes +// (thread.h) and make the library a bit more thread safe. Although thread +// support is quite stable by now, you may still consider recompiling the +// library without it if you have no use for it - this will result in a +// somewhat smaller and faster operation. +// +// This is ignored under Win16, threads are only supported under Win32. +// +// Default is 1 +// +// Recommended setting: 0 unless you do plan to develop MT applications +#define wxUSE_THREADS 0 + +// If enabled (1), compiles wxWindows streams classes +#define wxUSE_STREAMS 1 + +// Use standard C++ streams if 1. If 0, use wxWin streams implementation. +#define wxUSE_STD_IOSTREAM 0 + +// Use serialization (requires utils/serialize) +#define wxUSE_SERIAL 0 + +// ---------------------------------------------------------------------------- +// non GUI features selection +// ---------------------------------------------------------------------------- + +// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit +// integer which is implemented in terms of native 64 bit integers if any or +// uses emulation otherwise. +// +// This class is required by wxDateTime and so you should enable it if you want +// to use wxDateTime. For most modern platforms, it will use the native 64 bit +// integers in which case (almost) all of its functions are inline and it +// almost does not take any space, so there should be no reason to switch it +// off. +// +// Recommended setting: 1 +#define wxUSE_LONGLONG 1 + +// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level +// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions. +// +// Default is 1 +// +// Recommended setting: 1 (wxFile is highly recommended as it is required by +// i18n code, wxFileConfig and others) +#define wxUSE_FILE 1 +#define wxUSE_FFILE 1 + +// use wxTextBuffer class: required by wxTextFile +#define wxUSE_TEXTBUFFER 1 + +// use wxTextFile class: requires wxFile and wxTextBuffer, required by +// wxFileConfig +#define wxUSE_TEXTFILE 1 + +// i18n support: _() macro, wxLocale class. Requires wxTextFile. +#define wxUSE_INTL 1 + +// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which +// allow to manipulate dates, times and time intervals. wxDateTime replaces the +// old wxTime and wxDate classes which are still provided for backwards +// compatibility (and implemented in terms of wxDateTime). +// +// Note that this class is relatively new and is still officially in alpha +// stage because some features are not yet (fully) implemented. It is already +// quite useful though and should only be disabled if you are aiming at +// absolutely minimal version of the library. +// +// Requires: wxUSE_LONGLONG +// +// Default is 1 +// +// Recommended setting: 1 +#define wxUSE_DATETIME 1 + +// wxUSE_TIMEDATE enables compilation of the old wxDate and wxTime classes (not +// the same as wxDateTime!). These classes are obsolete and shouldn't be used +// in new code +// +// Default is 0 +// +// Recommended setting: 0 unless you have legacy code which uses these classes +#define wxUSE_TIMEDATE 0 + +// Set wxUSE_TIMER to 1 to compile wxTimer class +// +// Default is 1 +// +// Recommended setting: 1 +#define wxUSE_TIMER 1 + +// Use wxStopWatch clas. +// +// Default is 1 +// +// Recommended setting: 1 (needed by wxSocket) +#define wxUSE_STOPWATCH 1 + +// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes +// which allow the application to store its settings in the persistent +// storage. Setting this to 1 will also enable on-demand creation of the +// global config object in wxApp. +// +// See also wxUSE_CONFIG_NATIVE below. +// +// Recommended setting: 1 +#define wxUSE_CONFIG 1 + +// If wxUSE_CONFIG is 1, you may choose to use either the native config +// classes under Windows (using .INI files under Win16 and the registry under +// Win32) or the portable text file format used by the config classes under +// Unix. +// +// Default is 1 to use native classes. Note that you may still use +// wxFileConfig even if you set this to 1 - just the config object created by +// default for the applications needs will be a wxRegConfig or wxIniConfig and +// not wxFileConfig. +// +// Recommended setting: 1 +#define wxUSE_CONFIG_NATIVE 0 + +// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows +// to connect/disconnect from the network and be notified whenever the dial-up +// network connection is established/terminated. Requires wxUSE_DYNLIB_CLASS. +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_DIALUP_MANAGER 0 + +// Compile in wxLibrary class for run-time DLL loading and function calling. +// Required by wxUSE_DIALUP_MANAGER. +// +// This setting is for Win32 only +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_DYNLIB_CLASS 0 + +// Set to 1 to use socket classes +#define wxUSE_SOCKETS 0 + +// Set to 1 to enable virtual file systems (required by wxHTML) +#define wxUSE_FILESYSTEM 0 + +// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM) +#define wxUSE_FS_ZIP 0 + +// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM) +#define wxUSE_FS_INET 0 + +// Set to 1 to compile wxZipInput/OutputStream classes. +#define wxUSE_ZIPSTREAM 0 + +// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by +// wxUSE_LIBPNG. +#define wxUSE_ZLIB 0 + +// If enabled, the code written by Apple will be used to write, in a portable +// way, float on the disk. See extended.c for the license which is different +// from wxWindows one. +// +// Default is 1. +// +// Recommended setting: 1 unless you don't like the license terms (unlikely) +#define wxUSE_APPLE_IEEE 1 + +// Joystick support class +#define wxUSE_JOYSTICK 1 + +// wxFontMapper class +#define wxUSE_FONTMAP 1 + +// wxMimeTypesManager class +#define wxUSE_MIMETYPE 0 + +// wxSystemOptions class +#define wxUSE_SYSTEM_OPTIONS 1 + +// Support for regular expression matching via wxRegEx class: enable this to +// use POSIX regular expressions in your code. You need to compile regex +// library from src/regex to use it under Windows. +// +// Default is 0 +// +// Recommended setting: 1 if your compiler supports it, if it doesn't please +// contribute us a makefile for src/regex for it +#define wxUSE_REGEX 0 + +// wxWave class +#define wxUSE_WAVE 0 + +// ---------------------------------------------------------------------------- +// Individual GUI controls +// ---------------------------------------------------------------------------- + +// You must set wxUSE_CONTROLS to 1 if you are using any controls at all +// (without it, wxControl class is not compiled) +// +// Default is 1 +// +// Recommended setting: 1 (don't change except for very special programs) +#define wxUSE_CONTROLS 1 + +// wxPopupWindow class is not used currently by wxMSW +// +// Default is 0 +// +// Recommended setting: 0 +#define wxUSE_POPUPWIN 1 + +// Each of the settings below corresponds to one wxWindows control. They are +// all switched on by default but may be disabled if you are sure that your +// program (including any standard dialogs it can show!) doesn't need them and +// if you desperately want to save some space. If you use any of these you must +// set wxUSE_CONTROLS as well. +// +// Default is 1 +// +// Recommended setting: 1 +#define wxUSE_BUTTON 1 // wxButton +#define wxUSE_BMPBUTTON 1 // wxBitmapButton +#define wxUSE_CALENDARCTRL 0 // wxCalendarCtrl +#define wxUSE_CHECKBOX 1 // wxCheckBox +#define wxUSE_CHECKLISTBOX 0 // wxCheckListBox (requires wxUSE_OWNER_DRAWN) +#define wxUSE_CHOICE 1 // wxChoice +#define wxUSE_COMBOBOX 1 // wxComboBox +#define wxUSE_GAUGE 0 // wxGauge +#define wxUSE_LISTBOX 1 // wxListBox +#define wxUSE_LISTCTRL 0 // wxListCtrl +#define wxUSE_RADIOBOX 0 // wxRadioBox +#define wxUSE_RADIOBTN 1 // wxRadioButton +#define wxUSE_SCROLLBAR 1 // wxScrollBar +#define wxUSE_SLIDER 1 // wxSlider +#define wxUSE_SPINBTN 0 // wxSpinButton +#define wxUSE_SPINCTRL 0 // wxSpinCtrl +#define wxUSE_STATBOX 1 // wxStaticBox +#define wxUSE_STATLINE 1 // wxStaticLine +#define wxUSE_STATTEXT 1 // wxStaticText +#define wxUSE_STATBMP 1 // wxStaticBitmap +#define wxUSE_TEXTCTRL 1 // wxTextCtrl +#define wxUSE_TOGGLEBTN 0 // requires wxButton +#define wxUSE_TREECTRL 0 // wxTreeCtrl + +// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR +// below either wxStatusBar95 or a generic wxStatusBar will be used. +// +// Default is 1 +// +// Recommended setting: 1 +#define wxUSE_STATUSBAR 1 + +// Two status bar implementations are available under Win32: the generic one +// or the wrapper around native control. For native look and feel the native +// version should be used. +// +// Default is 1. +// +// Recommended setting: 1 (there is no advantage in using the generic one) +#define wxUSE_NATIVE_STATUSBAR 0 + +// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar +// classes at all. Otherwise, use the native toolbar class unless +// wxUSE_TOOLBAR_NATIVE is 0. Additionally, the generic toolbar class which +// supports some features which might not be supported by the native wxToolBar +// class may be compiled in if wxUSE_TOOLBAR_SIMPLE is 1. +// +// Default is 1 for all settings. +// +// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE and 0 for +// wxUSE_TOOLBAR_SIMPLE (the default is 1 mainly for backwards compatibility). +#define wxUSE_TOOLBAR 0 +#define wxUSE_TOOLBAR_NATIVE 0 +#define wxUSE_TOOLBAR_SIMPLE 0 + +// this setting is obsolete, value is ignored +#define wxUSE_BUTTONBAR 0 + +// wxNotebook is a control with several "tabs" located on one of its sides. It +// may be used ot logically organise the data presented to the user instead of +// putting everything in one huge dialog. It replaces wxTabControl and related +// classes of wxWin 1.6x. +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_NOTEBOOK 0 + +// wxTabDialog is a generic version of wxNotebook but it is incompatible with +// the new class. It shouldn't be used in new code. +// +// Default is 0. +// +// Recommended setting: 0 (use wxNotebook) +#define wxUSE_TAB_DIALOG 0 + +// wxGrid class comes in two flavours: the original (pre wxWin 2.2) one and +// the new, much imporved and enhanced version. The new version is backwards +// compatible with the old one and should be used whenever possible, i.e. if +// you set wxUSE_GRID to 1, set wxUSE_NEW_GRID to 1 too. +// +// Default is 1 for both options. +// +// Recommended setting: 1 for wxUSE_NEW_GRID, 0 if you have an old code using +// wxGrid and 100% backwards compatibality (with all old wxGrid quirks) is +// essential. +// +// WIN16/BC++ resets wxUSE_NEW_GRID to 0 because it exceeds the data limit. +#define wxUSE_GRID 0 +#define wxUSE_NEW_GRID 0 + +// wxProperty[Value/Form/List] classes, used by Dialog Editor +#define wxUSE_PROPSHEET 0 + +// ---------------------------------------------------------------------------- +// Miscellaneous GUI stuff +// ---------------------------------------------------------------------------- + +// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar) +#define wxUSE_ACCEL 0 + +// Use wxCaret: a class implementing a "cursor" in a text control (called caret +// under Windows). +// +// Default is 1. +// +// Recommended setting: 1 (can be safely set to 0, not used by the library) +#define wxUSE_CARET 1 + +// Miscellaneous geometry code: needed for Canvas library +#define wxUSE_GEOMETRY 1 + +// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and +// wxListCtrl. +// +// Default is 1. +// +// Recommended setting: 1 (set it to 0 if you don't use any of the controls +// enumerated above, then this class is mostly useless too) +#define wxUSE_IMAGLIST 0 + +// Use wxMenu, wxMenuBar, wxMenuItem. +// +// Default is 1. +// +// Recommended setting: 1 (can't be disabled under MSW) +#define wxUSE_MENUS 1 + +// Use wxSashWindow class. +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_SASH 1 + +// Use wxSplitterWindow class. +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_SPLITTER 1 + +// Use wxToolTip and wxWindow::Set/GetToolTip() methods. +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_TOOLTIPS 0 + +// wxValidator class and related methods +#define wxUSE_VALIDATORS 0 + +// wxDC cacheing implementation +#define wxUSE_DC_CACHEING 0 + +// ---------------------------------------------------------------------------- +// common dialogs +// ---------------------------------------------------------------------------- + +// Define 1 to use generic dialogs in Windows, even though they duplicate +// native common dialog (e.g. wxColourDialog). This is mainly useful for +// testing. +// +// Default is 0 +// +// Recommended setting: 0 +#define wxUSE_GENERIC_DIALOGS_IN_MSW 0 + +// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g. +// file selector, printer dialog). Switching this off also switches off the +// printing architecture and interactive wxPrinterDC. +// +// Default is 1 +// +// Recommended setting: 1 (unless it really doesn't work) +#define wxUSE_COMMON_DIALOGS 1 + +// wxBusyInfo displays window with message when app is busy. Works in same way +// as wxBusyCursor +#define wxUSE_BUSYINFO 0 + +// Use single/multiple choice dialogs. +// +// Default is 1 +// +// Recommended setting: 1 (used in the library itself) +#define wxUSE_CHOICEDLG 0 + +// Use colour picker dialog +// +// Default is 1 +// +// Recommended setting: 1 +#define wxUSE_COLOURDLG 0 + +// wxDirDlg class for getting a directory name from user +#define wxUSE_DIRDLG 0 + +// TODO: setting to choose the generic or native one + +// Use file open/save dialogs. +// +// Default is 1 +// +// Recommended setting: 1 (used in many places in the library itself) +#define wxUSE_FILEDLG 0 + +// Use find/replace dialogs. +// +// Default is 1 +// +// Recommended setting: 1 (but may be safely set to 0) +#define wxUSE_FINDREPLDLG 0 + +// Use font picker dialog +// +// Default is 1 +// +// Recommended setting: 1 (used in the library itself) +#define wxUSE_FONTDLG 0 + +// Use wxMessageDialog and wxMessageBox. +// +// Default is 1 +// +// Recommended setting: 1 (used in the library itself) +#define wxUSE_MSGDLG 1 + +// progress dialog class for lengthy operations +#define wxUSE_PROGRESSDLG 0 + +// support for startup tips (wxShowTip &c) +#define wxUSE_STARTUP_TIPS 0 + +// text entry dialog and wxGetTextFromUser function +#define wxUSE_TEXTDLG 0 + +// number entry dialog +#define wxUSE_NUMBERDLG 0 + +// splash screen class +#define wxUSE_SPLASH 0 + +// wizards +#define wxUSE_WIZARDDLG 0 + +// ---------------------------------------------------------------------------- +// Metafiles support +// ---------------------------------------------------------------------------- + +// Windows supports the graphics format known as metafile which is, though not +// portable, is widely used under Windows and so is supported by wxWin (under +// Windows only, of course). Win16 (Win3.1) used the so-called "Window +// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in +// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by +// default, WMFs will be used under Win16 and EMFs under Win32. This may be +// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting +// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile +// in any metafile related classes at all. +// +// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS. +// +// Recommended setting: default or 0 for everything for portable programs. +#define wxUSE_METAFILE 0 +#define wxUSE_ENH_METAFILE 0 +#define wxUSE_WIN_METAFILES_ALWAYS 0 + +// ---------------------------------------------------------------------------- +// Big GUI components +// ---------------------------------------------------------------------------- + +// Set to 0 to disable document/view architecture +#define wxUSE_DOC_VIEW_ARCHITECTURE 0 + +// Set to 0 to disable MDI document/view architecture +#define wxUSE_MDI_ARCHITECTURE 0 + +// Set to 0 to disable print/preview architecture code +#define wxUSE_PRINTING_ARCHITECTURE 0 + +// wxHTML sublibrary allows to display HTML in wxWindow programs and much, +// much more. +// +// Default is 1. +// +// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a +// smaller library. +#define wxUSE_HTML 0 + +// OpenGL canvas +#define wxUSE_GLCANVAS 0 + +// wxTreeLayout class +#define wxUSE_TREELAYOUT 0 + +// ---------------------------------------------------------------------------- +// Data transfer +// ---------------------------------------------------------------------------- + +// Use wxClipboard class for clipboard copy/paste. +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_CLIPBOARD 0 + +// Use wxDataObject and related classes. Needed for clipboard and OLE drag and +// drop +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_DATAOBJ 0 + +// Use wxDropTarget and wxDropSource classes for drag and drop (this is +// different from "built in" drag and drop in wxTreeCtrl which is always +// available). Requires wxUSE_DATAOBJ. +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_DRAG_AND_DROP 0 + +// ---------------------------------------------------------------------------- +// miscellaneous settings +// ---------------------------------------------------------------------------- + +// wxSingleInstanceChecker class allows to verify at startup if another program +// instance is running (it is only available under Win32) +// +// Default is 1 +// +// Recommended setting: 1 (the class is tiny, disabling it won't save much +// space) +#define wxUSE_SNGLINST_CHECKER 0 + +#define wxUSE_DRAGIMAGE 0 + +#define wxUSE_IPC 0 + // 0 for no interprocess comms +#define wxUSE_HELP 0 + // 0 for no help facility +#define wxUSE_MS_HTML_HELP 0 + // 0 for no MS HTML Help + +// Use wxHTML-based help controller? +#define wxUSE_WXHTML_HELP 0 + +#define wxUSE_RESOURCES 0 + // 0 for no wxGetResource/wxWriteResource +#define wxUSE_CONSTRAINTS 1 + // 0 for no window layout constraint system + +#define wxUSE_SPLINES 1 + // 0 for no splines + +#define wxUSE_XPM_IN_MSW 1 + // 0 for no XPM support in wxBitmap. + // Default is 1, as XPM is now fully + // supported this makes easier the issue + // of portable icons and bitmaps. + +#define wxUSE_IMAGE_LOADING_IN_MSW 0 + // Use dynamic DIB loading/saving code in utils/dib under MSW. +#define wxUSE_RESOURCE_LOADING_IN_MSW 0 + // Use dynamic icon/cursor loading/saving code + // under MSW. +#define wxUSE_WX_RESOURCES 0 + // Use .wxr resource mechanism (requires PrologIO library) + +#define wxUSE_MOUSEWHEEL 0 + // Include mouse wheel support + +// ---------------------------------------------------------------------------- +// postscript support settings +// ---------------------------------------------------------------------------- + +// Set to 1 for PostScript device context. +#define wxUSE_POSTSCRIPT 0 + +// Set to 1 to use font metric files in GetTextExtent +#define wxUSE_AFM_FOR_POSTSCRIPT 0 + +// Set to 0 to disable PostScript print/preview architecture code under Windows +// (just use Windows printing). +#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0 + +// ---------------------------------------------------------------------------- +// database classes +// ---------------------------------------------------------------------------- + +// Define 1 to use ODBC classes +#define wxUSE_ODBC 0 + +// For backward compatibility reasons, this parameter now only controls the +// default scrolling method used by cursors. This default behavior can be +// overriden by setting the second param of wxDB::wxDbGetConnection() or +// wxDb() constructor to indicate whether the connection (and any wxDbTable()s +// that use the connection) should support forward only scrolling of cursors, +// or both forward and backward support for backward scrolling cursors is +// dependent on the data source as well as the ODBC driver being used. +#define wxODBC_FWD_ONLY_CURSORS 1 + +// Default is 0. Set to 1 to use the deprecated classes, enum types, function, +// member variables. With a setting of 1, full backward compatability with the +// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0, +// as future development will be done only on the non-deprecated +// functions/classes/member variables/etc. +#define wxODBC_BACKWARD_COMPATABILITY 0 + +// ---------------------------------------------------------------------------- +// other compiler (mis)features +// ---------------------------------------------------------------------------- + +// Set this to 0 if your compiler can't cope with omission of prototype +// parameters. +// +// Default is 1. +// +// Recommended setting: 1 (should never need to set this to 0) +#define REMOVE_UNUSED_ARG 1 + +// VC++ 4.2 and above allows and but you can't mix +// them. Set to 1 for , 0 for +// +// Default is 1. +// +// Recommended setting: whatever your compiler likes more +#define wxUSE_IOSTREAMH 1 + +// ---------------------------------------------------------------------------- +// image format support +// ---------------------------------------------------------------------------- + +// wxImage supports many different image formats which can be configured at +// compile-time. BMP is always supported, others are optional and can be safely +// disabled if you don't plan to use images in such format sometimes saving +// substantial amount of code in the final library. +// +// Some formats require an extra library which is included in wxWin sources +// which is mentioned if it is the case. + +// Set to 1 for wxImage support (recommended). +#define wxUSE_IMAGE 1 + +// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB. +#define wxUSE_LIBPNG 0 + +// Set to 1 for JPEG format support (requires libjpeg) +#define wxUSE_LIBJPEG 0 + +// Set to 1 for TIFF format support (requires libtiff) +#define wxUSE_LIBTIFF 0 + +// Set to 1 for GIF format support +#define wxUSE_GIF 0 + +// Set to 1 for PNM format support +#define wxUSE_PNM 0 + +// Set to 1 for PCX format support +#define wxUSE_PCX 0 + +// Set to 1 for XPM format support +#define wxUSE_XPM 1 + +// Set to 1 to compile in wxPalette class +#define wxUSE_PALETTE 1 + +// ---------------------------------------------------------------------------- +// Windows-only settings +// ---------------------------------------------------------------------------- + +// Set this to 1 if you want to use wxWindows and MFC in the same program. This +// will override some other settings (see below) +// +// Default is 0. +// +// Recommended setting: 0 unless you really have to use MFC +#define wxUSE_MFC 0 + +// Set this to 1 for generic OLE support: this is required for drag-and-drop, +// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and +// can't compile/doesn't have the OLE headers. +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_OLE 0 + +// Set this to 1 to use Microsoft CTL3D library for "3D-look" under Win16 or NT +// 3.x. This setting is ignored under Win9x and NT 4.0+. +// +// Default is 0 for (most) Win32 (systems), 1 for Win16 +// +// Recommended setting: same as default +#if defined(__WIN95__) +#define wxUSE_CTL3D 0 +#else +#define wxUSE_CTL3D 1 +#endif + +// Define as 1 to use Microsoft's ItsyBitsy small title bar library, for +// wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native +// miniframes support instead. +// +// Default is 0 for (most) Win32 (systems), 1 for Win16 +// +// Recommended setting: same as default +#if defined(__WIN95__) +#define wxUSE_ITSY_BITSY 0 +#else +#define wxUSE_ITSY_BITSY 1 +#endif + +// Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH +// which allows to put more than ~32Kb of text in it even under Win9x (NT +// doesn't have such limitation). +// +// Default is 1 for compilers which support it +// +// Recommended setting: 1, only set it to 0 if your compiler doesn't have +// or can't compile +#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__) +#define wxUSE_RICHEDIT 1 + +// TODO: This should be ifdef'ed for any compilers that don't support +// RichEdit 2.0 but do have RichEdit 1.0... +#define wxUSE_RICHEDIT2 1 + +#else +#define wxUSE_RICHEDIT 0 +#define wxUSE_RICHEDIT2 0 +#endif + +// Set this to 1 to enable support for the owner-drawn menu and listboxes. This +// is required by wxUSE_CHECKLISTBOX. +// +// Default is 1. +// +// Recommended setting: 1, set to 0 for a small library size reduction +#define wxUSE_OWNER_DRAWN 0 + +// ---------------------------------------------------------------------------- +// obsolete settings +// ---------------------------------------------------------------------------- + +// NB: all settings in this section are obsolete and should not be used/changed +// at all, they will disappear + +// Set to 1 to use PenWindows +#define wxUSE_PENWINDOWS 0 + +// Define 1 to use bitmap messages. +#define wxUSE_BITMAP_MESSAGE 1 + +// If 1, enables provision of run-time type information. +// NOW MANDATORY: don't change. +#define wxUSE_DYNAMIC_CLASSES 1 + +// ---------------------------------------------------------------------------- +// disable the settings which don't work for some compilers +// ---------------------------------------------------------------------------- + +#ifndef wxUSE_NORLANDER_HEADERS +#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))) +# define wxUSE_NORLANDER_HEADERS 1 +#else +# define wxUSE_NORLANDER_HEADERS 0 +#endif +#endif + +#if defined(__GNUWIN32__) +// These don't work as expected for mingw32 and cygwin32 +#undef wxUSE_MEMORY_TRACING +#define wxUSE_MEMORY_TRACING 0 + +#undef wxUSE_GLOBAL_MEMORY_OPERATORS +#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 + +#undef wxUSE_DEBUG_NEW_ALWAYS +#define wxUSE_DEBUG_NEW_ALWAYS 0 + +// Cygwin betas don't have wcslen +#if defined(__CYGWIN__) || defined(__CYGWIN32__) +# if ! ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))) +# undef wxUSE_WCHAR_T +# define wxUSE_WCHAR_T 0 +# endif +#endif + +#endif // __GNUWIN32__ + +// MFC duplicates these operators +#if wxUSE_MFC +#undef wxUSE_GLOBAL_MEMORY_OPERATORS +#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 + +#undef wxUSE_DEBUG_NEW_ALWAYS +#define wxUSE_DEBUG_NEW_ALWAYS 0 +#endif // wxUSE_MFC + +// ODBC classes aren't Unicode-compatible yet +#if wxUSE_UNICODE +#undef wxUSE_ODBC +#define wxUSE_ODBC 0 +#endif + +#if (!defined(WIN32) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) +// Can't use OLE drag and drop in Windows 3.1 because we don't know how +// to implement UUIDs +// GnuWin32 doesn't have appropriate headers for e.g. IUnknown. +#undef wxUSE_DRAG_AND_DROP +#define wxUSE_DRAG_AND_DROP 0 +#endif + +// Only WIN32 supports wxStatusBar95 +#if !defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR +#undef wxUSE_NATIVE_STATUSBAR +#define wxUSE_NATIVE_STATUSBAR 0 +#endif + +#if !wxUSE_OWNER_DRAWN +#undef wxUSE_CHECKLISTBOX +#define wxUSE_CHECKLISTBOX 0 +#endif + +// Salford C++ doesn't like some of the memory operator definitions +#ifdef __SALFORDC__ +#undef wxUSE_MEMORY_TRACING +#define wxUSE_MEMORY_TRACING 0 + +#undef wxUSE_GLOBAL_MEMORY_OPERATORS +#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 + +#undef wxUSE_DEBUG_NEW_ALWAYS +#define wxUSE_DEBUG_NEW_ALWAYS 0 + +#undef wxUSE_THREADS +#define wxUSE_THREADS 0 + +#undef wxUSE_OWNER_DRAWN +#define wxUSE_OWNER_DRAWN 0 +#endif // __SALFORDC__ + +#ifdef __TWIN32__ + +#undef wxUSE_THREADS +#define wxUSE_THREADS 0 + +#undef wxUSE_ODBC +#define wxUSE_ODBC 0 + +#endif // __TWIN32__ + +// BC++/Win16 can't cope with the amount of data in resource.cpp +#if defined(__WIN16__) && defined(__BORLANDC__) +#undef wxUSE_WX_RESOURCES +#define wxUSE_WX_RESOURCES 0 + +#undef wxUSE_ODBC +#define wxUSE_ODBC 0 + +#undef wxUSE_NEW_GRID +#define wxUSE_NEW_GRID 0 +#endif + +#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500) +// BC++ 4.0 can't compile JPEG library +#undef wxUSE_LIBJPEG +#define wxUSE_LIBJPEG 0 +#endif + +// wxUSE_DEBUG_NEW_ALWAYS = 1 not compatible with BC++ in DLL mode +#if defined(__BORLANDC__) && (defined(WXMAKINGDLL) || defined(WXUSINGDLL)) +#undef wxUSE_DEBUG_NEW_ALWAYS +#define wxUSE_DEBUG_NEW_ALWAYS 0 +#endif + +#if defined(__WXMSW__) && defined(__WATCOMC__) +/* +#undef wxUSE_GLCANVAS +#define wxUSE_GLCANVAS 0 +*/ + +#undef wxUSE_WCHAR_T +#define wxUSE_WCHAR_T 0 +#endif + +#if defined(__WXMSW__) && !defined(__WIN32__) + +#undef wxUSE_SOCKETS +#define wxUSE_SOCKETS 0 + +#undef wxUSE_THREADS +#define wxUSE_THREADS 0 + +#undef wxUSE_TOOLTIPS +#define wxUSE_TOOLTIPS 0 + +#undef wxUSE_SPINCTRL +#define wxUSE_SPINCTRL 0 + +#undef wxUSE_SPINBTN +#define wxUSE_SPINBTN 0 + +#undef wxUSE_LIBPNG +#define wxUSE_LIBPNG 0 + +#undef wxUSE_LIBJPEG +#define wxUSE_LIBJPEG 0 + +#undef wxUSE_LIBTIFF +#define wxUSE_LIBTIFF 0 + +#undef wxUSE_GIF +#define wxUSE_GIF 0 + +#undef wxUSE_PNM +#define wxUSE_PNM 0 + +#undef wxUSE_PCX +#define wxUSE_PCX 0 + +#undef wxUSE_GLCANVAS +#define wxUSE_GLCANVAS 0 + +#undef wxUSE_MS_HTML_HELP +#define wxUSE_MS_HTML_HELP 0 + +#undef wxUSE_WCHAR_T +#define wxUSE_WCHAR_T 0 + +#endif // Win16 + +// ---------------------------------------------------------------------------- +// undef the things which don't make sense for wxBase build +// ---------------------------------------------------------------------------- + +#if !wxUSE_GUI + +#undef wxUSE_HTML +#define wxUSE_HTML 0 + +#endif // !wxUSE_GUI + +// ---------------------------------------------------------------------------- +// check the settings consistency: do it here to abort compilation immediately +// and not almost in the very end when the relevant file fails to compile and +// you need to modify setup.h and rebuild everything +// ---------------------------------------------------------------------------- + +#if wxUSE_DATETIME && !wxUSE_LONGLONG + #error wxDateTime requires wxLongLong +#endif + +#if wxUSE_TEXTFILE && !wxUSE_FILE + #error You cannot compile wxTextFile without wxFile +#endif + +#if wxUSE_FILESYSTEM && !wxUSE_STREAMS + #error You cannot compile virtual file systems without wxUSE_STREAMS +#endif + +#if wxUSE_HTML && !wxUSE_FILESYSTEM + #error You cannot compile wxHTML without virtual file systems +#endif + +// add more tests here... + +#endif + // _WX_SETUP_H_ diff --git a/samples/minimal/makefile.mic b/samples/minimal/makefile.mic index f560e6912d..e6e8fa3750 100644 --- a/samples/minimal/makefile.mic +++ b/samples/minimal/makefile.mic @@ -3,7 +3,7 @@ # Copyright (c) 2000 Martin Jolicoeur, Greg Haerr ############################################################################## -TOP=/home/julians/local/microwindows/microwin/src +TOP=/home/julians/microwindows/microwindows-0.89pre8/src CONFIG = $(TOP)/config WXDIR = ../.. OBJSUFF = o diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index b9c3a8e7ee..4bdaf88176 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -69,7 +69,7 @@ #include #include "wx/os2/private.h" #endif -#ifdef __WINDOWS__ +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) #if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) #include #include @@ -272,7 +272,7 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file) bool wxFileExists (const wxString& filename) { -#ifdef __WINDOWS__ +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) // GetFileAttributes can copy with network paths DWORD ret = GetFileAttributes(filename); DWORD isDir = (ret & FILE_ATTRIBUTE_DIRECTORY); @@ -1239,7 +1239,7 @@ bool wxPathExists(const wxChar *pszPathName) } #endif // __WINDOWS__ -#ifdef __WINDOWS__ +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) // Stat can't cope with network paths DWORD ret = GetFileAttributes(strPath.c_str()); DWORD isDir = (ret & FILE_ATTRIBUTE_DIRECTORY); diff --git a/src/common/filename.cpp b/src/common/filename.cpp index 6abcd26d01..46f2d0c03d 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -69,7 +69,7 @@ // small helper class which opens and closes the file - we use it just to get // a file handle for the given file name to pass it to some Win32 API function -#ifdef __WIN32__ +#if defined(__WIN32__) && !defined(__WXMICROWIN__) class wxFileHandle { @@ -121,7 +121,7 @@ private: // private functions // ---------------------------------------------------------------------------- -#ifdef __WIN32__ +#if defined(__WIN32__) && !defined(__WXMICROWIN__) // convert between wxDateTime and FILETIME which is a 64-bit value representing // the number of 100-nanosecond intervals since January 1, 1601. diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp index 7d3bced364..07f8ba9750 100644 --- a/src/common/imagxpm.cpp +++ b/src/common/imagxpm.cpp @@ -77,6 +77,7 @@ license is as follows: # include "wx/defs.h" #endif +#if wxUSE_XPM #include "wx/imagxpm.h" #include "wx/wfstream.h" @@ -221,3 +222,4 @@ bool wxXPMHandler::DoCanRead(wxInputStream& stream) #endif // wxUSE_STREAMS +#endif // wxUSE_XPM diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 0aefb4530a..f41c6ba9c5 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -1240,7 +1240,7 @@ wxString wxLocale::GetSystemEncodingName() { wxString encname; -#ifdef __WIN32__ +#if defined(__WIN32__) && !defined(__WXMICROWIN__) // FIXME: what is the error return value for GetACP()? UINT codepage = ::GetACP(); encname.Printf(_T("windows-%u"), codepage); @@ -1292,7 +1292,7 @@ wxString wxLocale::GetSystemEncodingName() /* static */ wxFontEncoding wxLocale::GetSystemEncoding() { -#ifdef __WIN32__ +#if defined(__WIN32__) && !defined(__WXMICROWIN__) UINT codepage = ::GetACP(); // wxWindows only knows about CP1250-1257, 932, 936, 949, 950 diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp index 6b702ebf5e..a29113876e 100644 --- a/src/common/quantize.cpp +++ b/src/common/quantize.cpp @@ -90,7 +90,7 @@ typedef struct { JSAMPLE *sample_range_limit, *srl_orig; } j_decompress; -#ifdef __WINDOWS__ +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) #define JMETHOD(type,methodname,arglist) type (__cdecl methodname) arglist #else #define JMETHOD(type,methodname,arglist) type (methodname) arglist diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 52c3b99282..517850d992 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -606,6 +606,7 @@ wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt) // Hack for wxNotebook case: at least in wxGTK, all pages // claim to be shown, so we must only deal with the selected one. +#if wxUSE_NOTEBOOK if (win->IsKindOf(CLASSINFO(wxNotebook))) { wxNotebook* nb = (wxNotebook*) win; @@ -618,6 +619,8 @@ wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt) return foundWin; } } +#endif + /* Doesn't work // Frame case else if (win->IsKindOf(CLASSINFO(wxFrame))) diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp index ebe1b3760b..b48a075680 100644 --- a/src/generic/spinctlg.cpp +++ b/src/generic/spinctlg.cpp @@ -35,6 +35,8 @@ #include "wx/textctrl.h" #endif //WX_PRECOMP +#if wxUSE_SPINCTRL + #include "wx/spinbutt.h" #include "wx/spinctrl.h" @@ -348,4 +350,5 @@ void wxSpinCtrl::SetRange(int min, int max) m_btn->SetRange(min, max); } +#endif // wxUSE_SPINCTRL #endif // !wxPort-with-native-spinctrl diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 67e6a44eae..35a9e2a58e 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -463,6 +463,7 @@ bool wxApp::UnregisterWindowClasses() { bool retval = TRUE; +#ifndef __WXMICROWIN__ // frame window class. if ( !UnregisterClass(wxFrameClassName, wxhInstance) ) { @@ -541,7 +542,8 @@ bool wxApp::UnregisterWindowClasses() retval = FALSE; } - +#endif + // __WXMICROWIN__ return retval; } diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 80668e7755..f3d7c453e4 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -49,7 +49,7 @@ #include "wx/msw/private.h" // needs to be before #include -#if wxUSE_COMMON_DIALOGS +#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__) #include #endif diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index 7a3531d84b..ac887e8c85 100644 --- a/src/msw/dialog.cpp +++ b/src/msw/dialog.cpp @@ -41,7 +41,7 @@ #include "wx/msw/private.h" #include "wx/log.h" -#if wxUSE_COMMON_DIALOGS +#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__) #include #endif diff --git a/src/msw/makefile.mic b/src/msw/makefile.mic index 7fc4d7b2e7..5467c5068a 100644 --- a/src/msw/makefile.mic +++ b/src/msw/makefile.mic @@ -3,7 +3,8 @@ # Copyright (c) 2000 Martin Jolicoeur, Greg Haerr ############################################################################## -TOP=/home/julians/local/microwindows/microwin/src +TOP=/home/julians/microwindows/microwindows-0.89pre8/src + CONFIG = $(TOP)/config WXDIR = ../.. OBJSUFF = o @@ -55,7 +56,6 @@ GENERICOBJS = \ $(GENDIR)/spinctlg.$(OBJSUFF) \ $(GENDIR)/splash.$(OBJSUFF) \ $(GENDIR)/splitter.$(OBJSUFF) \ - $(GENDIR)/statusbr.$(OBJSUFF) \ $(GENDIR)/tabg.$(OBJSUFF) \ $(GENDIR)/tbarsmpl.$(OBJSUFF) \ $(GENDIR)/textdlgg.$(OBJSUFF) \ @@ -68,11 +68,13 @@ GENERICOBJS = \ COMMONOBJS = \ $(COMMDIR)/appcmn.$(OBJSUFF) \ $(COMMDIR)/choiccmn.$(OBJSUFF) \ + $(COMMDIR)/clntdata.$(OBJSUFF) \ $(COMMDIR)/clipcmn.$(OBJSUFF) \ $(COMMDIR)/cmdline.$(OBJSUFF) \ $(COMMDIR)/cmdproc.$(OBJSUFF) \ $(COMMDIR)/cmndata.$(OBJSUFF) \ $(COMMDIR)/config.$(OBJSUFF) \ + $(COMMDIR)/containr.$(OBJSUFF) \ $(COMMDIR)/cshelp.$(OBJSUFF) \ $(COMMDIR)/ctrlcmn.$(OBJSUFF) \ $(COMMDIR)/ctrlsub.$(OBJSUFF) \ @@ -138,14 +140,18 @@ COMMONOBJS = \ $(COMMDIR)/radiocmn.$(OBJSUFF) \ $(COMMDIR)/resource.$(OBJSUFF) \ $(COMMDIR)/sizer.$(OBJSUFF) \ + $(COMMDIR)/statbar.$(OBJSUFF) \ $(COMMDIR)/strconv.$(OBJSUFF) \ $(COMMDIR)/stream.$(OBJSUFF) \ $(COMMDIR)/string.$(OBJSUFF) \ + $(COMMDIR)/sysopt.$(OBJSUFF) \ $(COMMDIR)/tbarbase.$(OBJSUFF) \ + $(COMMDIR)/textbuf.$(OBJSUFF) \ $(COMMDIR)/textcmn.$(OBJSUFF) \ $(COMMDIR)/textfile.$(OBJSUFF) \ $(COMMDIR)/timercmn.$(OBJSUFF) \ $(COMMDIR)/tokenzr.$(OBJSUFF) \ + $(COMMDIR)/toplvcmn.$(OBJSUFF) \ $(COMMDIR)/treebase.$(OBJSUFF) \ $(COMMDIR)/txtstrm.$(OBJSUFF) \ $(COMMDIR)/utilscmn.$(OBJSUFF) \ @@ -203,7 +209,6 @@ MSWOBJS = \ $(MICROWINDIR)/font.$(OBJSUFF) \ $(MICROWINDIR)/fontenum.$(OBJSUFF) \ $(MICROWINDIR)/fontutil.$(OBJSUFF) \ - $(MICROWINDIR)/frame.$(OBJSUFF) \ $(MICROWINDIR)/gdiimage.$(OBJSUFF) \ $(MICROWINDIR)/gdiobj.$(OBJSUFF) \ $(MICROWINDIR)/icon.$(OBJSUFF) \ @@ -211,12 +216,12 @@ MSWOBJS = \ $(MICROWINDIR)/microwin.$(OBJSUFF) \ $(MICROWINDIR)/palette.$(OBJSUFF) \ $(MICROWINDIR)/pen.$(OBJSUFF) \ - $(MICROWINDIR)/regconf.$(OBJSUFF) \ $(MICROWINDIR)/region.$(OBJSUFF) \ $(MICROWINDIR)/settings.$(OBJSUFF) \ $(MICROWINDIR)/snglinst.$(OBJSUFF) \ $(MICROWINDIR)/thread.$(OBJSUFF) \ $(MICROWINDIR)/timer.$(OBJSUFF) \ + $(MICROWINDIR)/toplevel.$(OBJSUFF) \ $(MICROWINDIR)/utils.$(OBJSUFF) \ $(MICROWINDIR)/window.$(OBJSUFF) \ $(OLEDIR)/dataobj.$(OBJSUFF) @@ -236,6 +241,7 @@ UNIVOBJS = \ $(UNIVDIR)/framuniv.$(OBJSUFF) \ $(UNIVDIR)/gauge.$(OBJSUFF) \ $(UNIVDIR)/inphand.$(OBJSUFF) \ + $(UNIVDIR)/inpcons.$(OBJSUFF) \ $(UNIVDIR)/listbox.$(OBJSUFF) \ $(UNIVDIR)/menu.$(OBJSUFF) \ $(UNIVDIR)/notebook.$(OBJSUFF) \ @@ -251,8 +257,10 @@ UNIVOBJS = \ $(UNIVDIR)/statbox.$(OBJSUFF) \ $(UNIVDIR)/statline.$(OBJSUFF) \ $(UNIVDIR)/stattext.$(OBJSUFF) \ + $(UNIVDIR)/statusbr.$(OBJSUFF) \ $(UNIVDIR)/textctrl.$(OBJSUFF) \ $(UNIVDIR)/theme.$(OBJSUFF) \ + $(UNIVDIR)/topluniv.$(OBJSUFF) \ $(UNIVDIR)/winuniv.$(OBJSUFF) \ $(UNIVDIR)/themes/gtk.$(OBJSUFF) \ $(UNIVDIR)/themes/win32.$(OBJSUFF) diff --git a/src/msw/region.cpp b/src/msw/region.cpp index 0d1b81aace..c91f276350 100644 --- a/src/msw/region.cpp +++ b/src/msw/region.cpp @@ -105,6 +105,10 @@ wxRegion::wxRegion(const wxRect& rect) wxRegion::wxRegion(size_t n, const wxPoint *points, int fillStyle) { +#ifdef __WXMICROWIN__ + m_refData = NULL; + M_REGION = NULL; +#else m_refData = new wxRegionRefData; M_REGION = ::CreatePolygonRgn ( @@ -112,6 +116,7 @@ wxRegion::wxRegion(size_t n, const wxPoint *points, int fillStyle) n, fillStyle == wxODDEVEN_RULE ? ALTERNATE : WINDING ); +#endif } /* diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 6df5465062..4482e103d9 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -45,7 +45,7 @@ #ifdef __WXMICROWIN__ -static inline bool IsIconic(HWND WXUNUSED(hwnd)) { return FALSE; } +// static inline bool IsIconic(HWND WXUNUSED(hwnd)) { return FALSE; } static inline bool IsZoomed(HWND WXUNUSED(hwnd)) { return FALSE; } #endif // __WXMICROWIN__ diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 775c7bb684..bcbc9cfe08 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -1233,7 +1233,9 @@ void wxWindowMSW::Clear() static inline void SendSetRedraw(HWND hwnd, bool on) { +#ifndef __WXMICROWIN__ ::SendMessage(hwnd, WM_SETREDRAW, (WPARAM)on, 0); +#endif } void wxWindowMSW::Freeze() @@ -4288,11 +4290,13 @@ extern wxWindow *wxGetWindowFromHWND(WXHWND hWnd) // FIXME: this is clearly not the best way to do it but I think we'll // need to change HWND <-> wxWindow code more heavily than I can // do it now to fix it +#ifndef __WXMICROWIN__ if ( ::GetWindow(hwnd, GW_OWNER) ) { // it's a dialog box, don't go upwards break; } +#endif hwnd = ::GetParent(hwnd); win = wxFindWinFromHandle((WXHWND)hwnd); -- 2.45.2