more /Wp64 warning fixes: mostly use UINT_PTR instead of UINT and define our WX[WL...

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

diff --git a/src/palmos/font.cpp b/src/palmos/font.cpp
index 19a6b18b46ee73acb1cd0ba81f1cc4da241a99c6..c2f192cbcabd4290b585e3d7814c321158d53935 100644 (file)
--- a/src/palmos/font.cpp
+++ b/src/palmos/font.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,12 +24,12 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/font.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/setup.h"

     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"

-    #include "wx/font.h"

     #include "wx/log.h"
     #include "wx/encinfo.h"
 #endif // WX_PRECOMP
     #include "wx/log.h"
     #include "wx/encinfo.h"
 #endif // WX_PRECOMP


@@ -256,7 +252,7 @@ public:
             m_weight = weight;
     }
 
             m_weight = weight;
     }
 

-    void SetFaceName(const wxString& faceName)
+    bool SetFaceName(const wxString& faceName)

     {
         if ( m_nativeFontInfoOk )
             m_nativeFontInfo.SetFaceName(faceName);
     {
         if ( m_nativeFontInfoOk )
             m_nativeFontInfo.SetFaceName(faceName);


@@ -319,6 +315,8 @@ protected:
     bool             m_nativeFontInfoOk;
 };
 
     bool             m_nativeFontInfoOk;
 };
 

+#define M_FONTDATA ((wxFontRefData*)m_refData)
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -368,10 +366,6 @@ void wxNativeFontInfo::SetPixelSize(const wxSize& pixelSize)
 // wxFont
 // ----------------------------------------------------------------------------
 
 // wxFont
 // ----------------------------------------------------------------------------
 

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

 bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)
 {
     return false;
 bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)
 {
     return false;


@@ -453,8 +447,9 @@ void wxFont::SetWeight(int weight)
 {
 }
 
 {
 }
 

-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)

 {
 {

+    return true;

 }
 
 void wxFont::SetUnderlined(bool underlined)
 }
 
 void wxFont::SetUnderlined(bool underlined)


@@ -527,4 +522,3 @@ bool wxFont::IsFixedWidth() const
 {
     return false;
 }
 {
     return false;
 }

-