added missing semicolons after asserts (patch 567853)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -52,7 +52,7 @@ protected:
|
|||||||
|
|
||||||
void wxUnknownControlContainer::AddChild(wxWindowBase *child)
|
void wxUnknownControlContainer::AddChild(wxWindowBase *child)
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( !m_controlAdded, wxT("Couldn't add two unknown controls to the same container!") )
|
wxASSERT_MSG( !m_controlAdded, wxT("Couldn't add two unknown controls to the same container!") );
|
||||||
|
|
||||||
wxPanel::AddChild(child);
|
wxPanel::AddChild(child);
|
||||||
|
|
||||||
|
@@ -433,7 +433,7 @@ void wxPluginLibrary::RestoreClassInfo()
|
|||||||
info = wxClassInfo::sm_first;
|
info = wxClassInfo::sm_first;
|
||||||
while( info->m_next && info->m_next != m_after ) info = info->m_next;
|
while( info->m_next && info->m_next != m_after ) info = info->m_next;
|
||||||
|
|
||||||
wxASSERT_MSG( info, _T("ClassInfo from wxPluginLibrary not found on purge"))
|
wxASSERT_MSG( info, _T("ClassInfo from wxPluginLibrary not found on purge"));
|
||||||
|
|
||||||
info->m_next = m_before;
|
info->m_next = m_before;
|
||||||
}
|
}
|
||||||
|
@@ -1960,7 +1960,7 @@ void wxWindowBase::ReleaseMouse()
|
|||||||
{
|
{
|
||||||
wxLogTrace(_T("mousecapture"), _T("ReleaseMouse(0x%08x)"), this);
|
wxLogTrace(_T("mousecapture"), _T("ReleaseMouse(0x%08x)"), this);
|
||||||
|
|
||||||
wxASSERT_MSG( GetCapture() == this, wxT("attempt to release mouse, but this window hasn't captured it") )
|
wxASSERT_MSG( GetCapture() == this, wxT("attempt to release mouse, but this window hasn't captured it") );
|
||||||
|
|
||||||
DoReleaseMouse();
|
DoReleaseMouse();
|
||||||
|
|
||||||
|
@@ -1730,7 +1730,7 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk
|
|||||||
// always) and makes using Mahogany quite annoying
|
// always) and makes using Mahogany quite annoying
|
||||||
#if 0
|
#if 0
|
||||||
wxASSERT_MSG( wxGetTopLevelParent(win) == g_activeFrame,
|
wxASSERT_MSG( wxGetTopLevelParent(win) == g_activeFrame,
|
||||||
wxT("unfocusing window that hasn't gained focus properly") )
|
wxT("unfocusing window that hasn't gained focus properly") );
|
||||||
#endif // 0
|
#endif // 0
|
||||||
|
|
||||||
g_activeFrameLostFocus = TRUE;
|
g_activeFrameLostFocus = TRUE;
|
||||||
|
@@ -1730,7 +1730,7 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk
|
|||||||
// always) and makes using Mahogany quite annoying
|
// always) and makes using Mahogany quite annoying
|
||||||
#if 0
|
#if 0
|
||||||
wxASSERT_MSG( wxGetTopLevelParent(win) == g_activeFrame,
|
wxASSERT_MSG( wxGetTopLevelParent(win) == g_activeFrame,
|
||||||
wxT("unfocusing window that hasn't gained focus properly") )
|
wxT("unfocusing window that hasn't gained focus properly") );
|
||||||
#endif // 0
|
#endif // 0
|
||||||
|
|
||||||
g_activeFrameLostFocus = TRUE;
|
g_activeFrameLostFocus = TRUE;
|
||||||
|
@@ -808,7 +808,7 @@ void wxWindowMGL::DoCaptureMouse()
|
|||||||
|
|
||||||
void wxWindowMGL::DoReleaseMouse()
|
void wxWindowMGL::DoReleaseMouse()
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( gs_mouseCapture == this, wxT("attempt to release mouse, but this window hasn't captured it") )
|
wxASSERT_MSG( gs_mouseCapture == this, wxT("attempt to release mouse, but this window hasn't captured it") );
|
||||||
|
|
||||||
MGL_wmUncaptureEvents(m_wnd, wxMGL_CAPTURE_MOUSE);
|
MGL_wmUncaptureEvents(m_wnd, wxMGL_CAPTURE_MOUSE);
|
||||||
gs_mouseCapture = NULL;
|
gs_mouseCapture = NULL;
|
||||||
|
@@ -370,7 +370,7 @@ bool wxBitmap::CreateFromXpm( const char **bits )
|
|||||||
XGetGeometry( xdisplay, pixmap, &xroot, &xRet, &yRet,
|
XGetGeometry( xdisplay, pixmap, &xroot, &xRet, &yRet,
|
||||||
&widthRet, &heightRet, &borderWidthRet, &depthRet);
|
&widthRet, &heightRet, &borderWidthRet, &depthRet);
|
||||||
|
|
||||||
wxASSERT_MSG( bpp == (int)depthRet, wxT("colour depth mismatch") )
|
wxASSERT_MSG( bpp == (int)depthRet, wxT("colour depth mismatch") );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
XpmFreeAttributes(&xpmAttr);
|
XpmFreeAttributes(&xpmAttr);
|
||||||
|
@@ -52,7 +52,7 @@ protected:
|
|||||||
|
|
||||||
void wxUnknownControlContainer::AddChild(wxWindowBase *child)
|
void wxUnknownControlContainer::AddChild(wxWindowBase *child)
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( !m_controlAdded, wxT("Couldn't add two unknown controls to the same container!") )
|
wxASSERT_MSG( !m_controlAdded, wxT("Couldn't add two unknown controls to the same container!") );
|
||||||
|
|
||||||
wxPanel::AddChild(child);
|
wxPanel::AddChild(child);
|
||||||
|
|
||||||
|
@@ -49,7 +49,7 @@ wxDllWidget::~wxDllWidget()
|
|||||||
|
|
||||||
void wxDllWidget::AddChild(wxWindowBase *child)
|
void wxDllWidget::AddChild(wxWindowBase *child)
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( !m_controlAdded, wxT("Couldn't load two widgets into one container!") )
|
wxASSERT_MSG( !m_controlAdded, wxT("Couldn't load two widgets into one container!") );
|
||||||
|
|
||||||
wxPanel::AddChild(child);
|
wxPanel::AddChild(child);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user