Use Courier New instead of Courier, to avoid bad characters

[wxWidgets.git] / include / wx / statbmp.h

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 3c81aa47817831ca757cedf72ebba8fb89fd3942..7eb8a31b73331ee8d72cb029554c1a0ae0dc58eb 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -12,7 +12,7 @@
 #ifndef _WX_STATBMP_H_BASE_
 #define _WX_STATBMP_H_BASE_
 
 #ifndef _WX_STATBMP_H_BASE_
 #define _WX_STATBMP_H_BASE_
 

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

     #pragma interface "statbmpbase.h"
 #endif
 
     #pragma interface "statbmpbase.h"
 #endif
 


@@ -34,17 +34,17 @@ class WXDLLEXPORT wxStaticBitmapBase : public wxControl
 public:
     wxStaticBitmapBase() { }
     virtual ~wxStaticBitmapBase();
 public:
     wxStaticBitmapBase() { }
     virtual ~wxStaticBitmapBase();

-    
+

     // our interface
     virtual void SetIcon(const wxIcon& icon) = 0;
     virtual void SetBitmap(const wxBitmap& bitmap) = 0;
     virtual wxBitmap GetBitmap() const = 0;
 
     // overriden base class virtuals
     // our interface
     virtual void SetIcon(const wxIcon& icon) = 0;
     virtual void SetBitmap(const wxBitmap& bitmap) = 0;
     virtual wxBitmap GetBitmap() const = 0;
 
     // overriden base class virtuals

-    virtual bool AcceptsFocus() const { return FALSE; }
+    virtual bool AcceptsFocus() const { return false; }

 
 protected:
 
 protected:

-    virtual wxSize DoGetBestClientSize() const;
+    virtual wxSize DoGetBestSize() const;

 
     DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
 };