implement default width for toolbar labels

[wxWidgets.git] / src / msw / ole / activex.cpp

diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp
index 19cb1feed80447d7141f7d79d77ef03f3107acfc..22a97cc03b66487da2d330ac30d9c655ada3a1b6 100644 (file)
--- a/src/msw/ole/activex.cpp
+++ b/src/msw/ole/activex.cpp
@@ -45,7 +45,7 @@ WX_DECLARE_AUTOOLE(wxAutoITypeInfo, ITypeInfo)
 WX_DECLARE_AUTOOLE(wxAutoIConnectionPoint, IConnectionPoint)
 WX_DECLARE_AUTOOLE(wxAutoIConnectionPointContainer, IConnectionPointContainer)
 
-wxDEFINE_EVENT( wxEVT_ACTIVEX, wxActiveXEvent )
+wxDEFINE_EVENT( wxEVT_ACTIVEX, wxActiveXEvent );
 
 // Ole class helpers (sort of MFC-like) from wxActiveX
 #define DECLARE_OLE_UNKNOWN(cls)\
@@ -904,13 +904,9 @@ wxActiveXContainer::~wxActiveXContainer()
 }
 
 // VZ: we might want to really report an error instead of just asserting here
-#ifdef __WXDEBUG__
-    #define CHECK_HR(hr) \
-        wxASSERT_MSG( SUCCEEDED(hr), \
+#define CHECK_HR(hr) \
+    wxASSERT_LEVEL_2_MSG( SUCCEEDED(hr), \
             wxString::Format("HRESULT = %X", (unsigned)(hr)) )
-#else
-    #define CHECK_HR(hr) wxUnusedVar(hr)
-#endif
 
 //---------------------------------------------------------------------------
 // wxActiveXContainer::CreateActiveX