projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for using wxDataObjectComposite with the clipboard
[wxWidgets.git]
/
src
/
mac
/
fontenum.cpp
diff --git
a/src/mac/fontenum.cpp
b/src/mac/fontenum.cpp
index 99cd68441ad9de7641580d276309485476ad105b..14491d79e93e542b49aea6b9c4c9a29cf53b3083 100644
(file)
--- a/
src/mac/fontenum.cpp
+++ b/
src/mac/fontenum.cpp
@@
-33,6
+33,7
@@
#endif
#include "wx/fontenum.h"
#endif
#include "wx/fontenum.h"
+#include "wx/fontutil.h"
#include "wx/fontmap.h"
#include "wx/fontutil.h"
#include "wx/fontmap.h"
#include "wx/fontutil.h"
@@
-101,7
+102,8
@@
bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
void wxFontEnumeratorHelper::DoEnumerate()
{
MenuHandle menu ;
void wxFontEnumeratorHelper::DoEnumerate()
{
MenuHandle menu ;
- Str255 name ;
+ Str255 p_name ;
+ char c_name[256] ;
short lines ;
menu = NewMenu( 32000 , "\pFont" ) ;
short lines ;
menu = NewMenu( 32000 , "\pFont" ) ;
@@
-110,11
+112,16
@@
void wxFontEnumeratorHelper::DoEnumerate()
for ( int i = 1 ; i < lines+1 ; i ++ )
{
for ( int i = 1 ; i < lines+1 ; i ++ )
{
- GetMenuItemText( menu , i , name ) ;
- p2cstr( name ) ;
- /*
-
- if ( m_fixedOnly )
+ GetMenuItemText( menu , i , p_name ) ;
+#if TARGET_CARBON
+ p2cstrcpy( c_name, p_name ) ;
+#else
+ p2cstr( p_name ) ;
+ strcpy( c_name, (char *)p_name ) ;
+#endif
+ /*
+
+ if ( m_fixedOnly )
{
// check that it's a fixed pitch font (there is *no* error here, the
// flag name is misleading!)
{
// check that it's a fixed pitch font (there is *no* error here, the
// flag name is misleading!)
@@
-135,7
+142,7
@@
void wxFontEnumeratorHelper::DoEnumerate()
}
*/
}
*/
- m_fontEnum->OnFacename( name ) ;
+ m_fontEnum->OnFacename(
c_
name ) ;
}
DisposeMenu( menu ) ;
}
}
DisposeMenu( menu ) ;
}