Changed back inline/const things

wxTabCtrl must have WS_CHILD window style
small access.cpp tweaks (call QueryInterface)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/datetime.h b/include/wx/datetime.h
index ca6a0ada1f0bc34a4ee86bc0824ab9d624c9c17f..27c40ec7bd8e84565bfbb874137d126413c117ed 100644 (file)
--- a/include/wx/datetime.h
+++ b/include/wx/datetime.h
@@ -36,7 +36,7 @@ class WXDLLEXPORT wxDateSpan;
 // rebuilt)
 
 // For Mingw32, causes a link error. (VZ: why?)
-#if defined( __WXDEBUG__) && !defined(__MINGW32__) && !defined(_MSC_VER)
+#if defined( __WXDEBUG__) && !defined(__MINGW32__) /* && !defined(_MSC_VER) */
     #define wxDATETIME_DONT_INLINE
 
     #undef inline

diff --git a/include/wx/datetime.inl b/include/wx/datetime.inl
index 17a8c36f37efccbf6b4dce4df79b119d7e210259..398b02828b0e3841d5b3343aa71bc50cfb62c2dc 100644 (file)
--- a/include/wx/datetime.inl
+++ b/include/wx/datetime.inl
@@ -36,7 +36,7 @@
 // ----------------------------------------------------------------------------
 
 // only define this once, when included from datetime.cpp
-#if 1 // def wxDEFINE_TIME_CONSTANTS
+#ifdef wxDEFINE_TIME_CONSTANTS
     const long wxDateTime::TIME_T_FACTOR = 1000l;
 #endif // wxDEFINE_TIME_CONSTANTS
 

diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp
index 3bc308ca4789ddef3ae4eedaa4f4674ed9d66970..7c1e16e3f192e254bf7376bb6f2a85f7be5d5a20 100644 (file)
--- a/src/msw/ole/access.cpp
+++ b/src/msw/ole/access.cpp
@@ -594,8 +594,11 @@ STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDis
             wxIAccessible* objectIA = child->GetIAccessible();
             if (!objectIA)
                 return E_FAIL;
-            *ppDispChild = objectIA;
-            objectIA->AddRef();
+
+               if (objectIA->QueryInterface(IID_IDispatch, (LPVOID*) ppDispChild) != S_OK)
+                   return E_FAIL;
+            
+            (*ppDispChild)->AddRef();
             return S_OK;
         }
         else

diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp
index c2553f2f2fe4c70ca26fab3695a1c51c9e789957..128ffff8cc3c2e5799605a53128c6644f7769d32 100644 (file)
--- a/src/msw/tabctrl.cpp
+++ b/src/msw/tabctrl.cpp
@@ -90,7 +90,7 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
 
   m_windowId = (id < 0 ? NewControlId() : id);
 
-  long tabStyle = 0;
+  long tabStyle = WS_CHILD;
   if (m_windowStyle & wxTC_MULTILINE)
     tabStyle |= TCS_MULTILINE;
   if (m_windowStyle & wxTC_RIGHTJUSTIFY)