projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed all symbols with the name "id" to "timerid" to allow Objective-C++
[wxWidgets.git]
/
include
/
wx
/
motif
/
font.h
diff --git
a/include/wx/motif/font.h
b/include/wx/motif/font.h
index 1cd7ea239f10f8144fc2895a108f827a577a635b..80d1a4f84115b86665579fba3cbb234331922411 100644
(file)
--- a/
include/wx/motif/font.h
+++ b/
include/wx/motif/font.h
@@
-12,7
+12,7
@@
#ifndef _WX_FONT_H_
#define _WX_FONT_H_
#ifndef _WX_FONT_H_
#define _WX_FONT_H_
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "font.h"
#endif
#pragma interface "font.h"
#endif
@@
-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);