wxMenuItem code cleanup, removing duplicate and unneccessary code

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

diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h
index 4fb5e08a3d72b7d4fa57206c3e2a757d1b7499e2..bd8eff6b268ca800c6d878bfd276efa4ecdf382c 100644 (file)
--- a/include/wx/motif/font.h
+++ b/include/wx/motif/font.h
@@ -13,12 +13,11 @@
 #define _WX_FONT_H_
 
 #if __WXMOTIF20__ && !__WXLESSTIF__
 #define _WX_FONT_H_
 
 #if __WXMOTIF20__ && !__WXLESSTIF__

-    #define wxMOTIF_NEW_FONT_HANDLING 1

     #define wxMOTIF_USE_RENDER_TABLE 1
 #else
     #define wxMOTIF_USE_RENDER_TABLE 1
 #else

-    #define wxMOTIF_NEW_FONT_HANDLING 0

     #define wxMOTIF_USE_RENDER_TABLE 0
 #endif
     #define wxMOTIF_USE_RENDER_TABLE 0
 #endif

+#define wxMOTIF_NEW_FONT_HANDLING wxMOTIF_USE_RENDER_TABLE

 
 class wxXFont;
 
 
 class wxXFont;
 


@@ -93,25 +92,26 @@ public:
         WXDisplay* display = NULL) const;
 
     // These two are helper functions for convenient access of the above.
         WXDisplay* display = NULL) const;
 
     // These two are helper functions for convenient access of the above.

-#if wxMOTIF_NEW_FONT_HANDLING
-    WXFontSet GetFontSet(double scale, WXDisplay* display = NULL) const;
-#else // if !wxMOTIF_NEW_FONT_HANDLING
-    WXFontStructPtr GetFontStruct(double scale = 1.0,
-        WXDisplay* display = NULL) const;
-#endif // wxMOTIF_NEW_FONT_HANDLING

 #if wxMOTIF_USE_RENDER_TABLE
 #if wxMOTIF_USE_RENDER_TABLE

+    WXFontSet GetFontSet(double scale, WXDisplay* display = NULL) const;

     WXRenderTable GetRenderTable(WXDisplay* display) const;
 #else // if !wxMOTIF_USE_RENDER_TABLE
     WXRenderTable GetRenderTable(WXDisplay* display) const;
 #else // if !wxMOTIF_USE_RENDER_TABLE

+    WXFontStructPtr GetFontStruct(double scale = 1.0,
+        WXDisplay* display = NULL) const;

     WXFontList GetFontList(double scale = 1.0,
         WXDisplay* display = NULL) const;
     WXFontList GetFontList(double scale = 1.0,
         WXDisplay* display = NULL) const;

-#endif // wxMOTIF_USE_RENDER_TABLE
+#endif // !wxMOTIF_USE_RENDER_TABLE

     // returns either a XmFontList or XmRenderTable, depending
     // on Motif version
     WXFontType GetFontType(WXDisplay* display) const;
     // like the function above but does a copy for XmFontList
     WXFontType GetFontTypeC(WXDisplay* display) const;
     static WXString GetFontTag();
     // returns either a XmFontList or XmRenderTable, depending
     // on Motif version
     WXFontType GetFontType(WXDisplay* display) const;
     // like the function above but does a copy for XmFontList
     WXFontType GetFontTypeC(WXDisplay* display) const;
     static WXString GetFontTag();

+

 protected:
 protected:

+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+

     virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
 
     void Unshare();
     virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
 
     void Unshare();


@@ -120,5 +120,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 

-#endif
-// _WX_FONT_H_
+#endif // _WX_FONT_H_