don't use wxVector<wxDataFormat> from wx/clipbrd.h as wxDataFormat definition is...

[wxWidgets.git] / src / palmos / font.cpp

diff --git a/src/palmos/font.cpp b/src/palmos/font.cpp
index c2f192cbcabd4290b585e3d7814c321158d53935..56bc52c737355bd37c367366a0e276fef91d1ad6 100644 (file)
--- a/src/palmos/font.cpp
+++ b/src/palmos/font.cpp
@@ -107,9 +107,9 @@ public:
     wxFontRefData(int size,
                   const wxSize& pixelSize,
                   bool sizeUsingPixels,
     wxFontRefData(int size,
                   const wxSize& pixelSize,
                   bool sizeUsingPixels,

-                  int family,
-                  int style,
-                  int weight,
+                  wxFontFamily family,
+                  wxFontStyle style,
+                  wxFontWeight weight,

                   bool underlined,
                   const wxString& faceName,
                   wxFontEncoding encoding)
                   bool underlined,
                   const wxString& faceName,
                   wxFontEncoding encoding)


@@ -231,12 +231,12 @@ public:
         }
     }
 
         }
     }
 

-    void SetFamily(int family)
+    void SetFamily(wxFontFamily family)

     {
         m_family = family;
     }
 
     {
         m_family = family;
     }
 

-    void SetStyle(int style)
+    void SetStyle(wxFontStyle style)

     {
         if ( m_nativeFontInfoOk )
             m_nativeFontInfo.SetStyle((wxFontStyle)style);
     {
         if ( m_nativeFontInfoOk )
             m_nativeFontInfo.SetStyle((wxFontStyle)style);


@@ -244,7 +244,7 @@ public:
             m_style = style;
     }
 
             m_style = style;
     }
 

-    void SetWeight(int weight)
+    void SetWeight(wxFontWeight weight)

     {
         if ( m_nativeFontInfoOk )
             m_nativeFontInfo.SetWeight((wxFontWeight)weight);
     {
         if ( m_nativeFontInfoOk )
             m_nativeFontInfo.SetWeight((wxFontWeight)weight);


@@ -287,9 +287,9 @@ protected:
     void Init(int size,
               const wxSize& pixelSize,
               bool sizeUsingPixels,
     void Init(int size,
               const wxSize& pixelSize,
               bool sizeUsingPixels,

-              int family,
-              int style,
-              int weight,
+              wxFontFamily family,
+              wxFontStyle style,
+              wxFontWeight weight,

               bool underlined,
               const wxString& faceName,
               wxFontEncoding encoding);
               bool underlined,
               const wxString& faceName,
               wxFontEncoding encoding);


@@ -300,9 +300,9 @@ protected:
     int           m_pointSize;
     wxSize        m_pixelSize;
     bool          m_sizeUsingPixels;
     int           m_pointSize;
     wxSize        m_pixelSize;
     bool          m_sizeUsingPixels;

-    int           m_family;
-    int           m_style;
-    int           m_weight;
+    wxFontFamily  m_family;
+    wxFontStyle   m_style;
+    wxFontWeight  m_weight;

     bool          m_underlined;
     wxString      m_faceName;
     wxFontEncoding m_encoding;
     bool          m_underlined;
     wxString      m_faceName;
     wxFontEncoding m_encoding;


@@ -328,9 +328,9 @@ protected:
 void wxFontRefData::Init(int pointSize,
                          const wxSize& pixelSize,
                          bool sizeUsingPixels,
 void wxFontRefData::Init(int pointSize,
                          const wxSize& pixelSize,
                          bool sizeUsingPixels,

-                         int family,
-                         int style,
-                         int weight,
+                         wxFontFamily family,
+                         wxFontStyle style,
+                         wxFontWeight weight,

                          bool underlined,
                          const wxString& faceName,
                          wxFontEncoding encoding)
                          bool underlined,
                          const wxString& faceName,
                          wxFontEncoding encoding)


@@ -381,9 +381,9 @@ wxFont::wxFont(const wxString& fontdesc)
 bool wxFont::DoCreate(int pointSize,
                       const wxSize& pixelSize,
                       bool sizeUsingPixels,
 bool wxFont::DoCreate(int pointSize,
                       const wxSize& pixelSize,
                       bool sizeUsingPixels,

-                      int family,
-                      int style,
-                      int weight,
+                      wxFontFamily family,
+                      wxFontStyle style,
+                      wxFontWeight weight,

                       bool underlined,
                       const wxString& faceName,
                       wxFontEncoding encoding)
                       bool underlined,
                       const wxString& faceName,
                       wxFontEncoding encoding)


@@ -398,6 +398,15 @@ wxFont::~wxFont()
 // ----------------------------------------------------------------------------
 // real implementation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // real implementation
 // ----------------------------------------------------------------------------

+wxGDIRefData *wxFont::CreateGDIRefData() const
+{
+    return new wxFontRefData();
+}
+
+wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxFontRefData(*static_cast<const wxFontRefData *>(data));
+}

 
 bool wxFont::RealizeResource()
 {
 
 bool wxFont::RealizeResource()
 {


@@ -419,10 +428,6 @@ bool wxFont::IsFree() const
     return false;
 }
 
     return false;
 }
 

-void wxFont::Unshare()
-{
-}
-

 // ----------------------------------------------------------------------------
 // change font attribute: we recreate font when doing it
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // change font attribute: we recreate font when doing it
 // ----------------------------------------------------------------------------


@@ -435,15 +440,15 @@ void wxFont::SetPixelSize(const wxSize& pixelSize)
 {
 }
 
 {
 }
 

-void wxFont::SetFamily(int family)
+void wxFont::SetFamily(wxFontFamily family)

 {
 }
 
 {
 }
 

-void wxFont::SetStyle(int style)
+void wxFont::SetStyle(wxFontStyle style)

 {
 }
 
 {
 }
 

-void wxFont::SetWeight(int weight)
+void wxFont::SetWeight(wxFontWeight weight)

 {
 }
 
 {
 }
 


@@ -483,17 +488,17 @@ bool wxFont::IsUsingSizeInPixels() const
     return false;
 }
 
     return false;
 }
 

-int wxFont::GetFamily() const
+wxFontFamily wxFont::GetFamily() const

 {
     return wxFONTFAMILY_ROMAN;
 }
 
 {
     return wxFONTFAMILY_ROMAN;
 }
 

-int wxFont::GetStyle() const
+wxFontStyle wxFont::GetStyle() const

 {
     return wxFONTSTYLE_NORMAL;
 }
 
 {
     return wxFONTSTYLE_NORMAL;
 }
 

-int wxFont::GetWeight() const
+wxFontWeight wxFont::GetWeight() const

 {
     return wxFONTWEIGHT_NORMAL;
 }
 {
     return wxFONTWEIGHT_NORMAL;
 }


@@ -518,6 +523,24 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
     return NULL;
 }
 
     return NULL;
 }
 

+wxString wxFont::GetNativeFontInfoDesc() const
+{
+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
+
+    // be sure we have an HFONT associated...
+    wxConstCast(this, wxFont)->RealizeResource();
+    return wxFontBase::GetNativeFontInfoDesc();
+}
+
+wxString wxFont::GetNativeFontInfoUserDesc() const
+{
+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
+
+    // be sure we have an HFONT associated...
+    wxConstCast(this, wxFont)->RealizeResource();
+    return wxFontBase::GetNativeFontInfoUserDesc();
+}
+

 bool wxFont::IsFixedWidth() const
 {
     return false;
 bool wxFont::IsFixedWidth() const
 {
     return false;