From 054d497f280187c599a6826d950090f72dccdc41 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 11 Jan 1999 16:05:33 +0000 Subject: [PATCH] Corrected thread.h inline problem. Set WXWIN_COMPATIBILITY to 0 by default in wxMSW. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/todo.txt | 8 ++++++-- include/wx/msw/setup.h | 9 +++++---- include/wx/thread.h | 4 ++-- samples/mdi/mdi.cpp | 2 +- src/msw/app.cpp | 1 + utils/tex2rtf/docs/tex2rtf.hpj | 2 +- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/docs/todo.txt b/docs/todo.txt index 23dd3dd552..1ebe191096 100644 --- a/docs/todo.txt +++ b/docs/todo.txt @@ -18,11 +18,15 @@ Please see also: - Get Karsten to remove trashed CVS files: - utils/glcanvas/isosurf/isosurf.dat.gz + include/wx/msw/magnif1.cur src/msw/ctl3d/* and re-add them. -- Complete this ToDo list :-) +- wxDB ODBC classes: it seems that there are too many + Sybase-specific features for it to work on e.g. MySQL, + PostgreSQL. Find out what Remstar uses and document + problems/restrictions. +- Complete this ToDo list :-) diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h index 1087b17903..aabac85663 100644 --- a/include/wx/msw/setup.h +++ b/include/wx/msw/setup.h @@ -22,11 +22,12 @@ #define _WX_GOODCOMPILER__ // gcc can have problems, but Windows compilers // are generally OK. -#define WXWIN_COMPATIBILITY 1 - // Compatibility with 1.66 API. +#define WXWIN_COMPATIBILITY 0 + // Compatibility with 1.68 API. // Level 0: no backward compatibility, all new features - // Level 1: wxDC, OnSize (etc.) compatibility, but - // some new features such as event tables + // Level 1: Some compatibility. In fact + // the compatibility code is now very minimal so there + // is little advantage to setting it to 1. #define wxUSE_AUTOTRANS 1 // Define wxTString diff --git a/include/wx/thread.h b/include/wx/thread.h index 4a545bd537..1e9d3e09b7 100644 --- a/include/wx/thread.h +++ b/include/wx/thread.h @@ -301,10 +301,10 @@ public: void WXDLLEXPORT wxMutexGuiLeaveOrEnter(); // returns TRUE if the main thread has GUI lock - inline bool WXDLLEXPORT wxGuiOwnedByMainThread(); + bool WXDLLEXPORT wxGuiOwnedByMainThread(); // wakes up the main thread if it's sleeping inside ::GetMessage() - inline void WXDLLEXPORT wxWakeUpMainThread(); + void WXDLLEXPORT wxWakeUpMainThread(); #else // !MSW // implement wxCriticalSection using mutexes inline wxCriticalSection::wxCriticalSection() { } diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp index d47b5f2ac1..10deb7665c 100644 --- a/samples/mdi/mdi.cpp +++ b/samples/mdi/mdi.cpp @@ -132,7 +132,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) ) { // Make another frame, containing a canvas MyChild *subframe = new MyChild(frame, "Canvas Frame", wxPoint(-1, -1), wxSize(-1, -1), - wxDEFAULT_FRAME); + wxDEFAULT_FRAME_STYLE); wxString title; title.Printf("Canvas Frame %d", winNumber); diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 9301d3f76d..70913744d6 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -649,6 +649,7 @@ int wxEntry(WXHINSTANCE hInstance, */ ::ExitProcess(3); // the same exit code as abort() + return 0; } #endif //debug } diff --git a/utils/tex2rtf/docs/tex2rtf.hpj b/utils/tex2rtf/docs/tex2rtf.hpj index 1cd112a064..b00537e2d3 100644 --- a/utils/tex2rtf/docs/tex2rtf.hpj +++ b/utils/tex2rtf/docs/tex2rtf.hpj @@ -1,5 +1,5 @@ [OPTIONS] -BMROOT=. +BMROOT=d:\wx2\wxWind~1\utils\tex2rtf\docs ; Assume that bitmaps are where the source is TITLE=Tex2RTF Manual CONTENTS=Contents COMPRESS=HIGH -- 2.45.2