From: Julian Smart Date: Mon, 2 Jul 2001 13:22:19 +0000 (+0000) Subject: Various wxUniversal/wxMicroWindows fixes X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8cb172b4f12fae80b06d5936108a1bc7f2521674 Various wxUniversal/wxMicroWindows fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/confbase.h b/include/wx/confbase.h index 95d9f8f282..25b97678b8 100644 --- a/include/wx/confbase.h +++ b/include/wx/confbase.h @@ -19,6 +19,7 @@ #endif #include "wx/defs.h" +#include "wx/string.h" // ---------------------------------------------------------------------------- // constants @@ -306,7 +307,8 @@ private: Replace environment variables ($SOMETHING) with their values. The format is $VARNAME or ${VARNAME} where VARNAME contains alphanumeric characters and '_' only. '$' must be escaped ('\$') in order to be taken literally. - */ +*/ + WXDLLEXPORT wxString wxExpandEnvVars(const wxString &sz); /* diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h index 2b8c141588..ec3baf4390 100644 --- a/include/wx/univ/combobox.h +++ b/include/wx/univ/combobox.h @@ -43,6 +43,8 @@ class WXDLLEXPORT wxComboControl; class WXDLLEXPORT wxListBox; class WXDLLEXPORT wxPopupComboWindow; +class WXDLLEXPORT wxTextCtrl; +class WXDLLEXPORT wxButton; // ---------------------------------------------------------------------------- // the actions supported by this control diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h index 11fa00a8cc..23dcaa13fc 100644 --- a/include/wx/univ/renderer.h +++ b/include/wx/univ/renderer.h @@ -35,6 +35,9 @@ class WXDLLEXPORT wxMenu; class WXDLLEXPORT wxScrollBar; class WXDLLEXPORT wxTextCtrl; class WXDLLEXPORT wxWindow; +#if wxUSE_GAUGE +class WXDLLEXPORT wxGauge; +#endif // wxUSE_GAUGE #include "wx/string.h" #include "wx/gdicmn.h" diff --git a/include/wx/univ/setup.h b/include/wx/univ/setup.h index cbb152eb41..1f4af2a899 100644 --- a/include/wx/univ/setup.h +++ b/include/wx/univ/setup.h @@ -55,7 +55,7 @@ #define wxUSE_ZIPSTREAM 0 #define wxUSE_ZLIB 0 #define wxUSE_APPLE_IEEE 0 -#define wxUSE_FILE 0 +#define wxUSE_FILE 1 #define wxUSE_FFILE 1 #define wxUSE_TEXTFILE 0 #define wxUSE_INTL 0 @@ -135,7 +135,7 @@ #define wxUSE_MS_HTML_HELP 0 #define wxUSE_RESOURCES 0 #define wxUSE_CONSTRAINTS 1 -#define wxUSE_CLIPBOARD 1 +#define wxUSE_CLIPBOARD 0 #define wxUSE_DATAOBJ 1 #define wxUSE_SPLINES 0 #define wxUSE_DRAG_AND_DROP 0 diff --git a/samples/minimal/makefile.mic b/samples/minimal/makefile.mic index c73f434bcd..3110304db4 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/microwindows/microwin/src +TOP=/home/julians/local/microwindows/microwin/src CONFIG = $(TOP)/config WXDIR = ../.. OBJSUFF = o @@ -25,7 +25,7 @@ include $(CONFIG) # Directories list for header files INCLUDEDIRS += -I$(WXDIR)/include # Defines for preprocessor -DEFINES += -DMWIN -D__WXMICROWIN__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__ +DEFINES += -DMWIN -D__WXMSW__ -D__WXMICROWIN__ -D__WXUNIVERSAL__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__ -DwxSIZE_T_IS_UINT -DWXWIN_OS_DESCRIPTION="\"MicroWindows\"" # Compilation flags for C files OTHER than include directories CFLAGS += diff --git a/src/common/config.cpp b/src/common/config.cpp index 470acd97b1..05ca5af209 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -28,17 +28,16 @@ #endif #include "wx/config.h" +#include "wx/intl.h" +#include "wx/log.h" #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE) #include "wx/app.h" #include "wx/file.h" -#include "wx/log.h" #include "wx/textfile.h" #include "wx/utils.h" -#include "wx/log.h" #include "wx/utils.h" -#include "wx/intl.h" #include #include diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 781e18dc95..92a7946418 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -1129,7 +1129,7 @@ bool wxMkdir(const wxString& dir, int perm) // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too // for the GNU compiler -#if (!(defined(__WXMSW__) || defined(__WXPM__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__) +#if (!(defined(__WXMSW__) || defined(__WXPM__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__) || defined(__WXMICROWIN__) if ( mkdir(wxFNCONV(dirname), perm) != 0 ) #elif defined(__WXPM__) if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's?? diff --git a/src/common/filename.cpp b/src/common/filename.cpp index aad2543db4..d3ee13116e 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -537,7 +537,7 @@ wxString wxFileName::GetFullPath( wxPathFormat format ) const // Return the short form of the path (returns identity on non-Windows platforms) wxString wxFileName::GetShortPath() const { -#if defined(__WXMSW__) && defined(__WIN32__) +#if defined(__WXMSW__) && defined(__WIN32__) && !defined(__WXMICROWIN__) wxString path(GetFullPath()); wxString pathOut; DWORD sz = ::GetShortPathName(path, NULL, 0); @@ -564,7 +564,7 @@ wxString wxFileName::GetShortPath() const // Return the long form of the path (returns identity on non-Windows platforms) wxString wxFileName::GetLongPath() const { -#if defined(__WXMSW__) && defined(__WIN32__) +#if defined(__WXMSW__) && defined(__WIN32__) && !defined(__WXMICROWIN__) wxString path(GetFullPath()); wxString pathOut; bool success = FALSE; diff --git a/src/common/log.cpp b/src/common/log.cpp index ffeeef2daa..03838b73d7 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -57,9 +57,11 @@ #include #include -#ifdef __WXMSW__ +#if defined(__WXMSW__) #include "wx/msw/private.h" // includes windows.h for OutputDebugString -#else //Unix +#endif + +#if !defined(__WXMSW__) || defined(__WXMICROWIN__) #include #endif //Win/Unix @@ -513,7 +515,7 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t)) // under Windows, programs usually don't have stderr at all, so show the // messages also under debugger - unless it's a console program -#if defined(__WXMSW__) && wxUSE_GUI +#if defined(__WXMSW__) && wxUSE_GUI && !defined(__WXMICROWIN__) str += wxT("\r\n") ; OutputDebugString(str.c_str()); #endif // MSW @@ -639,7 +641,7 @@ static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz) // get error code from syste unsigned long wxSysErrorCode() { -#ifdef __WXMSW__ +#if defined(__WXMSW__) && !defined(__WXMICROWIN__) #ifdef __WIN32__ return ::GetLastError(); #else //WIN16 @@ -657,7 +659,7 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode) if ( nErrCode == 0 ) nErrCode = wxSysErrorCode(); -#ifdef __WXMSW__ +#if defined(__WXMSW__) && !defined(__WXMICROWIN__) #ifdef __WIN32__ static wxChar s_szBuf[LOG_BUFFER_SIZE / 2]; @@ -714,7 +716,7 @@ bool wxAssertIsEqual(int x, int y) // break into the debugger void wxTrap() { -#ifdef __WXMSW__ +#if defined(__WXMSW__) && !defined(__WXMICROWIN__) DebugBreak(); #elif defined(__WXMAC__) #if __powerc @@ -779,7 +781,7 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg) // use the native message box if available: this is more robust than // using our own -#ifdef __WXMSW__ +#if defined(__WXMSW__) && !defined(__WXMICROWIN__) switch ( ::MessageBox(NULL, szBuf, _T("Debug"), MB_YESNOCANCEL | MB_ICONSTOP ) ) { case IDYES: diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp index f9c3b5538c..06e94b7636 100644 --- a/src/generic/tipwin.cpp +++ b/src/generic/tipwin.cpp @@ -34,6 +34,7 @@ #include "wx/tipwin.h" #include "wx/timer.h" +#include "wx/settings.h" // ---------------------------------------------------------------------------- // constants diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 7ad291e9d9..3adeae2cb4 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -242,7 +242,7 @@ bool wxApp::Initialize() InitCommonControls(); #endif // __WIN95__ -#if wxUSE_OLE || wxUSE_DRAG_AND_DROP || wxUSE_DATAOBJ +#if wxUSE_OLE || wxUSE_DRAG_AND_DROP #ifdef __WIN16__ // for OLE, enlarge message queue to be as large as possible @@ -250,6 +250,7 @@ bool wxApp::Initialize() while (!SetMessageQueue(iMsg) && (iMsg -= 8)) ; #endif // Win16 + // we need to initialize OLE library if ( FAILED(::OleInitialize(NULL)) ) wxLogError(_("Cannot initialize OLE")); @@ -717,7 +718,7 @@ int wxEntry(WXHINSTANCE hInstance, wxCHECK_MSG( wxApp::GetInitializerFunction(), 0, wxT("No initializer - use IMPLEMENT_APP macro.") ); - wxTheApp = (*wxApp::GetInitializerFunction()) (); + wxTheApp = (wxApp*) (*wxApp::GetInitializerFunction()) (); } wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") ); diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index d6e1ddd207..c7dc1834fd 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -382,6 +382,10 @@ bool wxBitmap::Create(int w, int h, int d) bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) { +#ifdef __WXMICROWIN__ + // TODO + return FALSE; +#else wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") ) m_refData = new wxBitmapRefData(); @@ -604,10 +608,15 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); return TRUE; +#endif } wxImage wxBitmap::ConvertToImage() const { +#ifdef __WXMICROWIN__ + // TODO + return wxImage(); +#else wxImage image; wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); @@ -732,6 +741,7 @@ wxImage wxBitmap::ConvertToImage() const free(lpBits); return image; +#endif } #endif // wxUSE_IMAGE diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp index ed6896cb65..3cbe217392 100644 --- a/src/msw/clipbrd.cpp +++ b/src/msw/clipbrd.cpp @@ -55,7 +55,10 @@ #include #include "wx/msw/private.h" + +#ifndef __WXMICROWIN__ #include "wx/msw/dib.h" +#endif // wxDataObject is tied to OLE/drag and drop implementation, therefore so are // the functions using wxDataObject in wxClipboard @@ -64,8 +67,11 @@ #if wxUSE_DATAOBJ #include "wx/dataobj.h" - // use OLE clipboard - #define wxUSE_OLE_CLIPBOARD 1 +// No: don't necessarily use OLE clipboard with data object +#if 0 + // use OLE clipboard + #define wxUSE_OLE_CLIPBOARD 1 +#endif #else // !wxUSE_DATAOBJ // use Win clipboard API #define wxUSE_OLE_CLIPBOARD 0 diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp index a7df1a6f25..bac04c76cd 100644 --- a/src/msw/colour.cpp +++ b/src/msw/colour.cpp @@ -21,6 +21,7 @@ #endif #include "wx/gdicmn.h" +#include "wx/msw/private.h" #include #include diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 0887188c47..11e667c925 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -537,9 +537,9 @@ void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1, HPEN hBrushOld = (HPEN)::SelectObject(GetHdc(), whiteBrush); ::SetROP2(GetHdc(), R2_COPYPEN); Rectangle(GetHdc(), x1, y1, x2, y2); - MoveTo(GetHdc(), x1, y1); + MoveToEx(GetHdc(), x1, y1, NULL); LineTo(GetHdc(), x2, y2); - MoveTo(GetHdc(), x2, y1); + MoveToEx(GetHdc(), x2, y1, NULL); LineTo(GetHdc(), x1, y2); ::SelectObject(GetHdc(), hPenOld); ::SelectObject(GetHdc(), hBrushOld); diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index ee00bfd5de..4de4676889 100644 --- a/src/msw/dialog.cpp +++ b/src/msw/dialog.cpp @@ -194,6 +194,7 @@ bool wxDialog::Create(wxWindow *parent, bool wxDialog::EnableCloseButton(bool enable) { +#ifndef __WXMICROWIN__ // get system (a.k.a. window) menu HMENU hmenu = ::GetSystemMenu(GetHwnd(), FALSE /* get it */); if ( !hmenu ) @@ -218,7 +219,8 @@ bool wxDialog::EnableCloseButton(bool enable) { wxLogLastError(_T("DrawMenuBar")); } - +#endif + return TRUE; } diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp index 8f45f1e05f..73d459dac2 100644 --- a/src/msw/evtloop.cpp +++ b/src/msw/evtloop.cpp @@ -32,6 +32,8 @@ #endif //WX_PRECOMP #include "wx/evtloop.h" +#include "wx/window.h" +#include "wx/app.h" #include "wx/msw/private.h" diff --git a/src/msw/makefile.mic b/src/msw/makefile.mic index ebf8204047..e263277d8c 100644 --- a/src/msw/makefile.mic +++ b/src/msw/makefile.mic @@ -3,7 +3,7 @@ # Copyright (c) 2000 Martin Jolicoeur, Greg Haerr ############################################################################## -TOP=/home/julians/microwindows/microwin/src +TOP=/home/julians/local/microwindows/microwin/src CONFIG = $(TOP)/config WXDIR = ../.. OBJSUFF = o @@ -206,10 +206,7 @@ MSWOBJS = \ $(MICROWINDIR)/gdiobj.$(OBJSUFF) \ $(MICROWINDIR)/icon.$(OBJSUFF) \ $(MICROWINDIR)/main.$(OBJSUFF) \ - $(MICROWINDIR)/menu.$(OBJSUFF) \ - $(MICROWINDIR)/menuitem.$(OBJSUFF) \ $(MICROWINDIR)/microwin.$(OBJSUFF) \ - $(MICROWINDIR)/msgdlg.$(OBJSUFF) \ $(MICROWINDIR)/palette.$(OBJSUFF) \ $(MICROWINDIR)/pen.$(OBJSUFF) \ $(MICROWINDIR)/regconf.$(OBJSUFF) \ @@ -219,7 +216,7 @@ MSWOBJS = \ $(MICROWINDIR)/thread.$(OBJSUFF) \ $(MICROWINDIR)/timer.$(OBJSUFF) \ $(MICROWINDIR)/utils.$(OBJSUFF) \ - $(MICROWINDIR)/window.$(OBJSUFF) + $(MICROWINDIR)/window.$(OBJSUFF) \ $(OLEDIR)/dataobj.$(OBJSUFF) UNIVOBJS_TODO = $(UNIVDIR)/choice.$(OBJSUFF) \ @@ -234,7 +231,7 @@ UNIVOBJS = \ $(UNIVDIR)/colschem.$(OBJSUFF) \ $(UNIVDIR)/combobox.$(OBJSUFF) \ $(UNIVDIR)/control.$(OBJSUFF) \ - $(UNIVDIR)/frameuniv.$(OBJSUFF) \ + $(UNIVDIR)/framuniv.$(OBJSUFF) \ $(UNIVDIR)/gauge.$(OBJSUFF) \ $(UNIVDIR)/inphand.$(OBJSUFF) \ $(UNIVDIR)/listbox.$(OBJSUFF) \ @@ -248,7 +245,6 @@ UNIVOBJS = \ $(UNIVDIR)/scrthumb.$(OBJSUFF) \ $(UNIVDIR)/slider.$(OBJSUFF) \ $(UNIVDIR)/spinbutt.$(OBJSUFF) \ - $(UNIVDIR)/spinctrl.$(OBJSUFF) \ $(UNIVDIR)/statbmp.$(OBJSUFF) \ $(UNIVDIR)/statbox.$(OBJSUFF) \ $(UNIVDIR)/statline.$(OBJSUFF) \ @@ -266,7 +262,7 @@ include $(CONFIG) # Directories list for header files INCLUDEDIRS += -I$(WXDIR)/include # Defines for preprocessor -DEFINES += -DMWIN -D__WXMSW__ -D__WXMICROWIN__ -D__WXUNIVERSAL__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__ +DEFINES += -DMWIN -D__WXMSW__ -D__WXMICROWIN__ -D__WXUNIVERSAL__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__ -DwxSIZE_T_IS_UINT -DWXWIN_OS_DESCRIPTION="\"MicroWindows\"" # Compilation flags for C files OTHER than include directories CFLAGS += diff --git a/src/msw/microwin.c b/src/msw/microwin.c index 3763ce7872..a399e32749 100644 --- a/src/msw/microwin.c +++ b/src/msw/microwin.c @@ -19,7 +19,7 @@ #include "windows.h" #include "wintern.h" #include "device.h" -#include "wx/microwin/microwin.h" +#include "wx/msw/microwin.h" void GdMoveCursor(MWCOORD x, MWCOORD y); void MwSetCursor(HWND wp, PMWCURSOR pcursor); diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 316917aafb..5994bed1f7 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -160,7 +160,7 @@ static void TranslateKbdEventToMouse(wxWindowMSW *win, static TEXTMETRIC wxGetTextMetrics(const wxWindowMSW *win); // check if the mouse is in the window or its child -static bool IsMouseInWindow(HWND hwnd); +//static bool IsMouseInWindow(HWND hwnd); // --------------------------------------------------------------------------- // event tables @@ -421,12 +421,19 @@ void wxWindowMSW::SetFocus() HWND hWnd = GetHwnd(); wxCHECK_RET( hWnd, _T("can't set focus to invalid window") ); +#ifndef __WXMICROWIN__ ::SetLastError(0); - +#endif + if ( !::SetFocus(hWnd) ) { // was there really an error? +#ifndef __WXMICROWIN__ DWORD dwRes = ::GetLastError(); +#else + + DWORD dwRes = 0; +#endif if ( dwRes ) { wxLogApiError(_T("SetFocus"), dwRes); @@ -1178,7 +1185,7 @@ void wxWindowMSW::Update() wxLogLastError(_T("UpdateWindow")); } -#ifdef __WIN32__ +#if defined(__WIN32__) && !defined(__WXMICROWIN__) // just calling UpdateWindow() is not enough, what we did in our WM_PAINT // handler needs to be really drawn right now (void)::GdiFlush(); @@ -2069,7 +2076,7 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam } break; -#ifdef __WXUNIVERSAL__ +#if defined(__WXUNIVERSAL__) && !defined(__WXMICROWIN__) case WM_ACTIVATEAPP: wxTheApp->SetActive(wParam != 0, FindFocus()); break; @@ -2546,6 +2553,7 @@ void wxWindowMSW::MSWDestroyWindow() void wxWindowMSW::MSWDetachWindowMenu() { +#ifndef __WXUNIVERSAL__ if ( m_hMenu ) { wxChar buf[1024]; @@ -2572,6 +2580,7 @@ void wxWindowMSW::MSWDetachWindowMenu() } } } +#endif } bool wxWindowMSW::MSWCreate(int id, @@ -3830,6 +3839,7 @@ bool wxWindowMSW::HandleKeyUp(WXWPARAM wParam, WXLPARAM lParam) bool wxWindowMSW::HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags) { +#ifdef JOY_BUTTON1 int change = 0; if ( flags & JOY_BUTTON1CHG ) change = wxJOY_BUTTON1; @@ -3906,6 +3916,9 @@ bool wxWindowMSW::HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags) event.SetEventObject(this); return GetEventHandler()->ProcessEvent(event); +#else + return FALSE; +#endif } // --------------------------------------------------------------------------- diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp index 40020d468a..3a1859b370 100644 --- a/src/univ/combobox.cpp +++ b/src/univ/combobox.cpp @@ -46,6 +46,7 @@ #include "wx/combobox.h" #include "wx/listbox.h" #include "wx/textctrl.h" + #include "wx/bmpbuttn.h" #include "wx/validate.h" #endif diff --git a/src/univ/listbox.cpp b/src/univ/listbox.cpp index b0ef47a462..a11766268e 100644 --- a/src/univ/listbox.cpp +++ b/src/univ/listbox.cpp @@ -242,7 +242,7 @@ void wxListBox::DoClear() size_t count = m_itemsClientData.GetCount(); for ( size_t n = 0; n < count; n++ ) { - delete m_itemsClientData[n]; + delete (wxClientData *) m_itemsClientData[n]; } } @@ -275,7 +275,7 @@ void wxListBox::Delete(int n) if ( HasClientObjectData() ) { - delete m_itemsClientData[n]; + delete (wxClientData *)m_itemsClientData[n]; } m_itemsClientData.RemoveAt(n); diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp index 0c9f850aa5..9c24407cd3 100644 --- a/src/univ/menu.cpp +++ b/src/univ/menu.cpp @@ -41,6 +41,8 @@ #include "wx/popupwin.h" #include "wx/evtloop.h" +#include "wx/dcclient.h" +#include "wx/frame.h" #include "wx/univ/renderer.h" diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp index d359b2e455..852d926621 100644 --- a/src/univ/notebook.cpp +++ b/src/univ/notebook.cpp @@ -31,8 +31,8 @@ #include "wx/imaglist.h" #include "wx/notebook.h" - #include "wx/spinbutt.h" +#include "wx/dcmemory.h" #include "wx/univ/renderer.h" diff --git a/src/univ/renderer.cpp b/src/univ/renderer.cpp index eebe8b3062..36f7f0d853 100644 --- a/src/univ/renderer.cpp +++ b/src/univ/renderer.cpp @@ -43,6 +43,10 @@ #include "wx/univ/renderer.h" #include "wx/univ/colschem.h" +#if wxUSE_GAUGE +#include "wx/gauge.h" +#endif + // ============================================================================ // implementation // ============================================================================ diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp index b0de2d829c..49aee0df40 100644 --- a/src/univ/scrolbar.cpp +++ b/src/univ/scrolbar.cpp @@ -353,7 +353,7 @@ void wxScrollBar::OnIdle(wxIdleEvent& event) dc.DrawRectangle(rect); // under Unix we use "--sync" X option for this - #ifdef __WXMSW__ + #if defined(__WXMSW__) && !defined(__WXMICROWIN__) ::GdiFlush(); ::Sleep(200); #endif // __WXMSW__ diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp index e4904c1ddd..47f7749cc2 100644 --- a/src/univ/themes/gtk.cpp +++ b/src/univ/themes/gtk.cpp @@ -34,6 +34,7 @@ #include "wx/checkbox.h" #include "wx/listbox.h" #include "wx/checklst.h" + #include "wx/combobox.h" #include "wx/scrolbar.h" #include "wx/slider.h" #include "wx/textctrl.h" diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp index cdce6b3ab5..b584acc811 100644 --- a/src/univ/themes/win32.cpp +++ b/src/univ/themes/win32.cpp @@ -35,6 +35,7 @@ #include "wx/button.h" #include "wx/listbox.h" #include "wx/checklst.h" + #include "wx/combobox.h" #include "wx/scrolbar.h" #include "wx/slider.h" #include "wx/textctrl.h" @@ -42,6 +43,7 @@ #include "wx/notebook.h" #include "wx/spinbutt.h" +#include "wx/settings.h" #include "wx/univ/scrtimer.h" diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp index 1e68456863..5066ebe080 100644 --- a/src/univ/winuniv.cpp +++ b/src/univ/winuniv.cpp @@ -36,6 +36,7 @@ #include "wx/event.h" #include "wx/scrolbar.h" #include "wx/menu.h" + #include "wx/frame.h" #endif // WX_PRECOMP #include "wx/univ/colschem.h" @@ -345,7 +346,7 @@ void wxWindow::Refresh(bool eraseBackground, const wxRect *rectClient) dc.DrawRectangle(rectWin); // under Unix we use "--sync" X option for this - #ifdef __WXMSW__ + #if defined(__WXMSW__) && !defined(__WXMICROWIN__) ::GdiFlush(); ::Sleep(200); #endif // __WXMSW__