Make wxJoystick::GetNumberJoystick a static method, as the number of

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

diff --git a/include/wx/cocoa/font.h b/include/wx/cocoa/font.h
index 65b868c80adfc705f7463e9f2c652e21231cfb07..477c3e0b9ee2011cc28dfbdd583dbeb751455cd0 100644 (file)
--- a/include/wx/cocoa/font.h
+++ b/include/wx/cocoa/font.h
@@ -12,10 +12,6 @@
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "font.h"
-#endif
-

 class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 {
     friend class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 {
     friend class WXDLLEXPORT wxFont;


@@ -27,11 +23,11 @@ public:
         , m_style(wxNORMAL)
         , m_weight(wxNORMAL)
         , m_underlined(FALSE)
         , m_style(wxNORMAL)
         , m_weight(wxNORMAL)
         , m_underlined(FALSE)

-        , m_faceName("Geneva")
+        , m_faceName(wxT("Geneva"))

         , m_encoding(wxFONTENCODING_DEFAULT)
     {
         Init(10, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
         , m_encoding(wxFONTENCODING_DEFAULT)
     {
         Init(10, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,

-             "Geneva", wxFONTENCODING_DEFAULT);
+             wxT("Geneva"), wxFONTENCODING_DEFAULT);

     }
 
     wxFontRefData(const wxFontRefData& data)
     }
 
     wxFontRefData(const wxFontRefData& data)


@@ -152,6 +148,7 @@ public:
     virtual bool GetUnderlined() const;
     virtual wxString GetFaceName() const;
     virtual wxFontEncoding GetEncoding() const;
     virtual bool GetUnderlined() const;
     virtual wxString GetFaceName() const;
     virtual wxFontEncoding GetEncoding() const;

+    virtual const wxNativeFontInfo *GetNativeFontInfo() const;

 
     virtual void SetPointSize(int pointSize);
     virtual void SetFamily(int family);
 
     virtual void SetPointSize(int pointSize);
     virtual void SetFamily(int family);