implment wxBitmapButton::DoGetBestSize

[wxWidgets.git] / include / wx / msw / font.h

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 06c17b10b12d366f4bb6b64e22f7ce81fad36a64..13674e03c55d0cb79d0e6951b4ce08d13afadf8e 100644 (file)
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -12,7 +12,7 @@
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "font.h"
 #endif
 
@@ -72,7 +72,7 @@ public:
     virtual bool GetUnderlined() const;
     virtual wxString GetFaceName() const;
     virtual wxFontEncoding GetEncoding() const;
-    virtual wxNativeFontInfo* GetNativeFontInfo() const;
+    virtual const wxNativeFontInfo *GetNativeFontInfo() const;
 
     virtual void SetPointSize(int pointSize);
     virtual void SetFamily(int family);
@@ -81,7 +81,6 @@ public:
     virtual void SetFaceName(const wxString& faceName);
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
-    virtual void SetNativeFontInfo(const wxNativeFontInfo& info);
 
     virtual bool IsFixedWidth() const;
 
@@ -90,11 +89,10 @@ public:
 
     virtual bool IsFree() const;
     virtual bool RealizeResource();
-    virtual WXHANDLE GetResourceHandle();
+    virtual WXHANDLE GetResourceHandle() const;
     virtual bool FreeResource(bool force = FALSE);
 
-    // for consistency with other wxMSW classes and to have a const
-    // GetResourceHandle()-like function we have a synonym for it
+    // for consistency with other wxMSW classes
     WXHFONT GetHFONT() const;
 
     /*
@@ -103,6 +101,8 @@ public:
      */
 
 protected:
+    virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
+
     // common part of all ctors
     void Init();