Another package name fix

[wxWidgets.git] / wxPython / contrib / dllwidget / dllwidget.cpp

diff --git a/wxPython/contrib/dllwidget/dllwidget.cpp b/wxPython/contrib/dllwidget/dllwidget.cpp
index 025c28b8062532a4e92fc6c83571a5ebf214d47d..54274419b6129b0fccc66458e378e07f50c8644b 100644 (file)
--- a/wxPython/contrib/dllwidget/dllwidget.cpp
+++ b/wxPython/contrib/dllwidget/dllwidget.cpp
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dllwidget.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -35,7 +31,7 @@ wxDllWidget::wxDllWidget(wxWindow *parent,
                          long style)
     : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL | wxNO_BORDER,
               className + wxT("_container")),
                          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 )
 {
     SetBackgroundColour(wxColour(255, 0, 255));
     if ( !!className )


@@ -53,11 +49,10 @@ void wxDllWidget::AddChild(wxWindowBase *child)
 
     wxPanel::AddChild(child);
 
 
     wxPanel::AddChild(child);
 

-    m_controlAdded = TRUE;
+    m_controlAdded = true;

     wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
     sizer->Add((wxWindow*)child, 1, wxEXPAND);
     SetSizer(sizer);
     wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
     sizer->Add((wxWindow*)child, 1, wxEXPAND);
     SetSizer(sizer);

-    SetAutoLayout(TRUE);

     Layout();
 }
 
     Layout();
 }
 


@@ -85,7 +80,7 @@ bool wxDllWidget::LoadWidget(const wxString& dll, const wxString& className,
     {
         delete m_lib;
         m_lib = NULL;
     {
         delete m_lib;
         m_lib = NULL;

-        return FALSE;
+        return false;

     }
 
     DLL_WidgetFactory_t factory;
     }
 
     DLL_WidgetFactory_t factory;


@@ -94,7 +89,7 @@ bool wxDllWidget::LoadWidget(const wxString& dll, const wxString& className,
     {
         delete m_lib;
         m_lib = NULL;
     {
         delete m_lib;
         m_lib = NULL;

-        return FALSE;
+        return false;

     }
 
     if ( !factory(className, this, style, &m_widget, &m_cmdFunc) )
     }
 
     if ( !factory(className, this, style, &m_widget, &m_cmdFunc) )


@@ -103,10 +98,10 @@ bool wxDllWidget::LoadWidget(const wxString& dll, const wxString& className,
         delete m_lib;
         m_lib = NULL;
         m_widget = NULL;
         delete m_lib;
         m_lib = NULL;
         m_widget = NULL;

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 void wxDllWidget::UnloadWidget()
 }
 
 void wxDllWidget::UnloadWidget()