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

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

diff --git a/src/univ/statbmp.cpp b/src/univ/statbmp.cpp
index ec00a570861e85b616125c0f61578b99ef50d401..f305d9ff2d646dbd78221c88b70341aa15f74ad0 100644 (file)
--- a/src/univ/statbmp.cpp
+++ b/src/univ/statbmp.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     25.08.00
 // RCS-ID:      $Id$

-// Copyright:   (c) 2000 Vadim Zeitlin
-// Licence:     wxWindows license
+// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
+// Licence:     wxWindows licence

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


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

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

     #pragma implementation "univstatbmp.h"
 #endif
 
     #pragma implementation "univstatbmp.h"
 #endif
 


@@ -58,7 +58,7 @@ bool wxStaticBitmap::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;

 
     // set bitmap first
     SetBitmap(label);
 
     // set bitmap first
     SetBitmap(label);


@@ -66,7 +66,7 @@ bool wxStaticBitmap::Create(wxWindow *parent,
     // and adjust our size to fit it after this
     SetBestSize(size);
 
     // and adjust our size to fit it after this
     SetBestSize(size);
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------