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

do not export private symbols in wx shared libraries

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-01-24 13:40:46 +00:00
parent ded5dd7689
commit 7d7b3f69f2
6 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/dcbase.cpp
View File

@@ -788,7 +788,7 @@ void wx_spline_push(double x1, double y1, double x2, double y2, double x3, doubl
static bool wx_spline_add_point(double x, double y); static bool wx_spline_add_point(double x, double y);
static void wx_spline_draw_point_array(wxDC *dc); static void wx_spline_draw_point_array(wxDC *dc);
wxPointList wx_spline_point_list; static wxPointList wx_spline_point_list;
#define half(z1, z2) ((z1+z2)/2.0) #define half(z1, z2) ((z1+z2)/2.0)
#define THRESHOLD 5 #define THRESHOLD 5

12
src/common/imagpng.cpp
View File

@@ -148,19 +148,19 @@ struct wxPNGInfoStruct
extern "C" extern "C"
{ {
void PNGLINKAGEMODE wx_PNG_stream_reader( png_structp png_ptr, png_bytep data, static void PNGLINKAGEMODE wx_PNG_stream_reader( png_structp png_ptr, png_bytep data,
png_size_t length ) png_size_t length )
{ {
WX_PNG_INFO(png_ptr)->stream.in->Read(data, length); WX_PNG_INFO(png_ptr)->stream.in->Read(data, length);
} }
void PNGLINKAGEMODE wx_PNG_stream_writer( png_structp png_ptr, png_bytep data, static void PNGLINKAGEMODE wx_PNG_stream_writer( png_structp png_ptr, png_bytep data,
png_size_t length ) png_size_t length )
{ {
WX_PNG_INFO(png_ptr)->stream.out->Write(data, length); WX_PNG_INFO(png_ptr)->stream.out->Write(data, length);
} }
void static void
PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message) PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message)
{ {
wxPNGInfoStruct *info = png_ptr ? WX_PNG_INFO(png_ptr) : NULL; wxPNGInfoStruct *info = png_ptr ? WX_PNG_INFO(png_ptr) : NULL;
@@ -170,7 +170,7 @@ PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message)
// from pngerror.c // from pngerror.c
// so that the libpng doesn't send anything on stderr // so that the libpng doesn't send anything on stderr
void static void
PNGLINKAGEMODE wx_png_error(png_structp png_ptr, png_const_charp message) PNGLINKAGEMODE wx_png_error(png_structp png_ptr, png_const_charp message)
{ {
wx_png_warning(NULL, message); wx_png_warning(NULL, message);

10
src/common/list.cpp
View File

@@ -701,9 +701,13 @@ bool wxStringList::Member(const wxChar *s) const
} }
#ifdef __WXWINCE__ #ifdef __WXWINCE__
extern "C" int __cdecl extern "C"
{
static int __cdecl
#else #else
extern "C" int LINKAGEMODE extern "C"
{
static int LINKAGEMODE
#endif #endif
wx_comparestrings(const void *arg1, const void *arg2) wx_comparestrings(const void *arg1, const void *arg2)
@@ -714,6 +718,8 @@ wx_comparestrings(const void *arg1, const void *arg2)
return wxStrcmp (*s1, *s2); return wxStrcmp (*s1, *s2);
} }
} // end of extern "C" (required because of GCC Bug c++/33078
// Sort a list of strings - deallocates old nodes, allocates new // Sort a list of strings - deallocates old nodes, allocates new
void wxStringList::Sort() void wxStringList::Sort()
{ {

2
src/common/zipstrm.cpp
View File

@@ -140,7 +140,7 @@ static wxFileOffset QuietSeek(wxInputStream& stream, wxFileOffset pos)
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Class factory // Class factory
wxZipClassFactory g_wxZipClassFactory; static wxZipClassFactory g_wxZipClassFactory;
wxZipClassFactory::wxZipClassFactory() wxZipClassFactory::wxZipClassFactory()
{ {

4
src/generic/listctrl.cpp
View File

@@ -4889,8 +4889,8 @@ int wxListMainWindow::GetItemWidthWithImage(wxListItem * item)
// sorting // sorting
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxListCtrlCompare list_ctrl_compare_func_2; static wxListCtrlCompare list_ctrl_compare_func_2;
long list_ctrl_compare_data; static long list_ctrl_compare_data;
int LINKAGEMODE list_ctrl_compare_func_1( wxListLineData **arg1, wxListLineData **arg2 ) int LINKAGEMODE list_ctrl_compare_func_1( wxListLineData **arg1, wxListLineData **arg2 )
{ {

7
src/html/m_layout.cpp
View File

@@ -83,9 +83,12 @@ private:
}; };
// Comparison routine for bsearch into an int* array of pagebreaks. // Comparison routine for bsearch into an int* array of pagebreaks.
extern "C" int wxCMPFUNC_CONV wxInteger_compare(void const* i0, void const* i1) extern "C"
{ {
return *(int*)i0 - *(int*)i1; static int wxCMPFUNC_CONV wxInteger_compare(void const* i0, void const* i1)
{
return *(int*)i0 - *(int*)i1;
}
} }
bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, wxArrayInt& known_pagebreaks) const bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, wxArrayInt& known_pagebreaks) const