make cocoa mediactrl usable. Some touchups to carbon mediactrl code. Add notebook...

[wxWidgets.git] / src / univ / statbox.cpp

diff --git a/src/univ/statbox.cpp b/src/univ/statbox.cpp
index 3c8b948466647c4b701147dfb2ea70c9753cf27d..20316fc323fb0866e5f23f4a1d1b4b3024a86b72 100644 (file)
--- a/src/univ/statbox.cpp
+++ b/src/univ/statbox.cpp
@@ -6,7 +6,7 @@
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "univstatbox.h"
 #endif
 
     #pragma implementation "univstatbox.h"
 #endif
 


@@ -56,11 +56,11 @@ bool wxStaticBox::Create(wxWindow *parent,
                          const wxString &name)
 {
     if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) )
                          const wxString &name)
 {
     if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) )

-        return FALSE;
+        return false;

 
     SetLabel(label);
 
 
     SetLabel(label);
 

-    return TRUE;
+    return true;

 }
 
 void wxStaticBox::DoDraw(wxControlRenderer *renderer)
 }
 
 void wxStaticBox::DoDraw(wxControlRenderer *renderer)