Implemented PocketPC menubar/toolbar as wxToolMenuBar derived

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

diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h
index 62be50f08e018c1cb58192601f72dc1d9e894e46..9f84b11bda685c27b46d5e23ebe546c4ef597c81 100644 (file)
--- a/include/wx/motif/font.h
+++ b/include/wx/motif/font.h
@@ -30,7 +30,7 @@ public:
         int family,
         int style,
         int weight,
         int family,
         int style,
         int weight,

-        bool underlined = FALSE,
+        bool underlined = false,

         const wxString& face = wxEmptyString,
         wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
         const wxString& face = wxEmptyString,
         wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {


@@ -45,7 +45,7 @@ public:
         int family,
         int style,
         int weight,
         int family,
         int style,
         int weight,

-        bool underlined = FALSE,
+        bool underlined = false,

         const wxString& face = wxEmptyString,
         wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
         const wxString& face = wxEmptyString,
         wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 


@@ -67,7 +67,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 wxNativeFontInfo *GetNativeFontInfo() 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);


@@ -113,7 +113,7 @@ protected:
     void Init();
 
     // VZ: IMHO, we don't need it at all...
     void Init();
 
     // VZ: IMHO, we don't need it at all...

-    bool RealizeResource() { return TRUE; }
+    bool RealizeResource() { return true; }

     void Unshare();
 
 private:
     void Unshare();
 
 private: