AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use WX_PIZZA(...) to deference pointers only when we are sure that the pointer is non-NULL

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi 2009-04-20 18:49:20 +00:00
parent 2ff0354a3a
commit 9a33c3ef80
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gtk/window.cpp
View File

@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: src/gtk/window.cpp // Name: src/gtk/window.cpp
// Purpose: // Purpose: wxWindowGTK implementation
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
// Copyright: (c) 1998 Robert Roebling, Julian Smart // Copyright: (c) 1998 Robert Roebling, Julian Smart
@ -1958,8 +1958,10 @@ wxWindow *wxWindowBase::DoFindFocus()
void wxWindowGTK::AddChildGTK(wxWindowGTK* child) void wxWindowGTK::AddChildGTK(wxWindowGTK* child)
{ {
/* the window might have been scrolled already, do we wxASSERT_MSG(m_wxwindow, "Cannot add a child to a window without a client area");
have to adapt the position */
// the window might have been scrolled already, we
// have to adapt the position
wxPizza* pizza = WX_PIZZA(m_wxwindow); wxPizza* pizza = WX_PIZZA(m_wxwindow);
child->m_x += pizza->m_scroll_x; child->m_x += pizza->m_scroll_x;
child->m_y += pizza->m_scroll_y; child->m_y += pizza->m_scroll_y;
@ -2436,7 +2438,10 @@ bool wxWindowGTK::Destroy()
void wxWindowGTK::DoMoveWindow(int x, int y, int width, int height) void wxWindowGTK::DoMoveWindow(int x, int y, int width, int height)
{ {
gtk_widget_set_size_request(m_widget, width, height); gtk_widget_set_size_request(m_widget, width, height);
// inform the parent to perform the move // inform the parent to perform the move
wxASSERT_MSG(m_parent && m_parent->m_wxwindow,
"the parent window has no client area?");
WX_PIZZA(m_parent->m_wxwindow)->move(m_widget, x, y); WX_PIZZA(m_parent->m_wxwindow)->move(m_widget, x, y);
} }