Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed back inline/const things

Browse Source 
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
This commit is contained in:
Julian Smart
2003-02-17 12:43:47 +00:00
parent ae23a52a16
commit e0496eaaa4
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/datetime.h
View File

@@ -36,7 +36,7 @@ class WXDLLEXPORT wxDateSpan;
// rebuilt) // rebuilt)
// For Mingw32, causes a link error. (VZ: why?) // 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 #define wxDATETIME_DONT_INLINE
#undef inline #undef inline

2
include/wx/datetime.inl
View File

@@ -36,7 +36,7 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// only define this once, when included from datetime.cpp // 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; const long wxDateTime::TIME_T_FACTOR = 1000l;
#endif // wxDEFINE_TIME_CONSTANTS #endif // wxDEFINE_TIME_CONSTANTS

7
src/msw/ole/access.cpp
View File

@@ -594,8 +594,11 @@ STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDis
wxIAccessible* objectIA = child->GetIAccessible(); wxIAccessible* objectIA = child->GetIAccessible();
if (!objectIA) if (!objectIA)
return E_FAIL; return E_FAIL;
*ppDispChild = objectIA;
objectIA->AddRef(); if (objectIA->QueryInterface(IID_IDispatch, (LPVOID*) ppDispChild) != S_OK)
return E_FAIL;
(*ppDispChild)->AddRef();
return S_OK; return S_OK;
} }
else else

2
src/msw/tabctrl.cpp
View File

@@ -90,7 +90,7 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
m_windowId = (id < 0 ? NewControlId() : id); m_windowId = (id < 0 ? NewControlId() : id);
long tabStyle = 0; long tabStyle = WS_CHILD;
if (m_windowStyle & wxTC_MULTILINE) if (m_windowStyle & wxTC_MULTILINE)
tabStyle |= TCS_MULTILINE; tabStyle |= TCS_MULTILINE;
if (m_windowStyle & wxTC_RIGHTJUSTIFY) if (m_windowStyle & wxTC_RIGHTJUSTIFY)