Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not export compare functions in the wx ABI

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-02-15 12:48:31 +00:00
parent af59b3fc6d
commit 2ad4f89f57
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/encconv.cpp
View File

@@ -51,11 +51,11 @@ static const wxUint16* GetEncTable(wxFontEncoding enc)
int i = enc-wxFONTENCODING_MACMIN ; int i = enc-wxFONTENCODING_MACMIN ;
if ( gMacEncodingsInited[i] == false ) if ( gMacEncodingsInited[i] == false )
{ {
// create // create
CFStringEncoding cfencoding = wxMacGetSystemEncFromFontEnc( enc ) ; CFStringEncoding cfencoding = wxMacGetSystemEncFromFontEnc( enc ) ;
if( !CFStringIsEncodingAvailable( cfencoding ) ) if( !CFStringIsEncodingAvailable( cfencoding ) )
return NULL; return NULL;
memset( gMacEncodings[i] , 0 , 128 * 2 ); memset( gMacEncodings[i] , 0 , 128 * 2 );
char s[2] = { 0 , 0 }; char s[2] = { 0 , 0 };
CFRange firstchar = CFRangeMake( 0, 1 ); CFRange firstchar = CFRangeMake( 0, 1 );
@@ -84,12 +84,14 @@ typedef struct {
wxUint8 c; wxUint8 c;
} CharsetItem; } CharsetItem;
extern "C" int wxCMPFUNC_CONV extern "C"
{
static int wxCMPFUNC_CONV
CompareCharsetItems(const void *i1, const void *i2) CompareCharsetItems(const void *i1, const void *i2)
{ {
return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u ); return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u );
} }
}
static CharsetItem* BuildReverseTable(const wxUint16 *tbl) static CharsetItem* BuildReverseTable(const wxUint16 *tbl)
{ {
@@ -321,7 +323,7 @@ bool wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output) const
wxT("You must call wxEncodingConverter::Init() before actually converting!")); wxT("You must call wxEncodingConverter::Init() before actually converting!"));
bool replaced = false; bool replaced = false;
for (i = input, o = output; *i != 0;) for (i = input, o = output; *i != 0;)
*(o++) = (wchar_t)(GetTableValue(m_Table, (wxUint8)*(i++), replaced)); *(o++) = (wchar_t)(GetTableValue(m_Table, (wxUint8)*(i++), replaced));
*o = 0; *o = 0;

2
src/univ/listbox.cpp
View File

@@ -477,7 +477,7 @@ int wxListBox::GetSelection() const
return m_selections.IsEmpty() ? wxNOT_FOUND : m_selections[0]; return m_selections.IsEmpty() ? wxNOT_FOUND : m_selections[0];
} }
int wxCMPFUNC_CONV wxCompareInts(int *n, int *m) static int wxCMPFUNC_CONV wxCompareInts(int *n, int *m)
{ {
return *n - *m; return *n - *m;
} }

5
src/unix/fontenum.cpp
View File

@@ -49,7 +49,9 @@
extern GtkWidget *wxGetRootWindow(); extern GtkWidget *wxGetRootWindow();
#endif // __WXGTK20__ #endif // __WXGTK20__
extern "C" int wxCMPFUNC_CONV extern "C"
{
static int wxCMPFUNC_CONV
wxCompareFamilies (const void *a, const void *b) wxCompareFamilies (const void *a, const void *b)
{ {
const char *a_name = pango_font_family_get_name (*(PangoFontFamily **)a); const char *a_name = pango_font_family_get_name (*(PangoFontFamily **)a);
@@ -57,6 +59,7 @@ wxCompareFamilies (const void *a, const void *b)
return g_utf8_collate (a_name, b_name); return g_utf8_collate (a_name, b_name);
} }
}
bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
bool fixedWidthOnly) bool fixedWidthOnly)