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

diff --git a/docs/todo.txt b/docs/todo.txt
index 23dd3dd55239a685135ba8470e0feaf9eb6ad2d1..1ebe1910966b9a61c347c281629c2d4a227d42df 100644 (file)
--- 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 1087b17903fedbecb503d9062d1393eac311701f..aabac856631396800374a27878ec67bc6e5f2125 100644 (file)
--- 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 4a545bd537cd109aae5a46f545c6fb4691ae3b41..1e9d3e09b761ffd6609b7ca2bbd21be635c43e6e 100644 (file)
--- 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 d47b5f2ac196c4a02f72b04d103710deed182ae9..10deb7665c0a1c9fc8fc2fc35ba8f4ddc60534c1 100644 (file)
--- 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 9301d3f76da6e1d2c7b85ff92aa10c900077689f..70913744d685d5b66fec4ae9788e8f9aa16ce2ca 100644 (file)
--- 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 1cd112a06468f81341f0a1c8531f92f2fe401c1c..b00537e2d3f04dafc73ca58ad75fcc2525ff6dba 100644 (file)
--- 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