X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a61305d364dcf229395fb223daec31e2d6efcb4..6b91d1134092fb05310c3e72393cc2720c552e9e:/wxPython/contrib/dllwidget/dllwidget.cpp diff --git a/wxPython/contrib/dllwidget/dllwidget.cpp b/wxPython/contrib/dllwidget/dllwidget.cpp index 7e39d634fd..4a876c93e1 100644 --- a/wxPython/contrib/dllwidget/dllwidget.cpp +++ b/wxPython/contrib/dllwidget/dllwidget.cpp @@ -35,7 +35,7 @@ wxDllWidget::wxDllWidget(wxWindow *parent, long style) : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL | wxNO_BORDER, className + wxT("_container")), - m_widget(NULL), m_lib(NULL), m_controlAdded(FALSE) + m_widget(NULL), m_lib(NULL), m_controlAdded(false) { SetBackgroundColour(wxColour(255, 0, 255)); if ( !!className ) @@ -49,15 +49,14 @@ wxDllWidget::~wxDllWidget() 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); - m_controlAdded = TRUE; + m_controlAdded = true; wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL); sizer->Add((wxWindow*)child, 1, wxEXPAND); SetSizer(sizer); - SetAutoLayout(TRUE); Layout(); } @@ -85,7 +84,7 @@ bool wxDllWidget::LoadWidget(const wxString& dll, const wxString& className, { delete m_lib; m_lib = NULL; - return FALSE; + return false; } DLL_WidgetFactory_t factory; @@ -94,7 +93,7 @@ bool wxDllWidget::LoadWidget(const wxString& dll, const wxString& className, { delete m_lib; m_lib = NULL; - return FALSE; + return false; } if ( !factory(className, this, style, &m_widget, &m_cmdFunc) ) @@ -103,10 +102,10 @@ bool wxDllWidget::LoadWidget(const wxString& dll, const wxString& className, delete m_lib; m_lib = NULL; m_widget = NULL; - return FALSE; + return false; } - return TRUE; + return true; } void wxDllWidget::UnloadWidget()