From 7d7b3f69f2b8ab29b3cb8ceb6e2923018cf96562 Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Sat, 24 Jan 2009 13:40:46 +0000 Subject: [PATCH] do not export private symbols in wx shared libraries git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/dcbase.cpp | 2 +- src/common/imagpng.cpp | 12 ++++++------ src/common/list.cpp | 10 ++++++++-- src/common/zipstrm.cpp | 4 ++-- src/generic/listctrl.cpp | 38 +++++++++++++++++++------------------- src/html/m_layout.cpp | 7 +++++-- 6 files changed, 41 insertions(+), 32 deletions(-) diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp index 224cf624a1..6dc769fe8b 100644 --- a/src/common/dcbase.cpp +++ b/src/common/dcbase.cpp @@ -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 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 THRESHOLD 5 diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 2ffb924bf9..474221ae11 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -148,19 +148,19 @@ struct wxPNGInfoStruct extern "C" { -void PNGLINKAGEMODE wx_PNG_stream_reader( png_structp png_ptr, png_bytep data, - png_size_t length ) +static void PNGLINKAGEMODE wx_PNG_stream_reader( png_structp png_ptr, png_bytep data, + png_size_t length ) { WX_PNG_INFO(png_ptr)->stream.in->Read(data, length); } -void PNGLINKAGEMODE wx_PNG_stream_writer( png_structp png_ptr, png_bytep data, - png_size_t length ) +static void PNGLINKAGEMODE wx_PNG_stream_writer( png_structp png_ptr, png_bytep data, + png_size_t 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) { 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 // 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) { wx_png_warning(NULL, message); diff --git a/src/common/list.cpp b/src/common/list.cpp index dcfb1b3358..4bdefdba20 100644 --- a/src/common/list.cpp +++ b/src/common/list.cpp @@ -701,9 +701,13 @@ bool wxStringList::Member(const wxChar *s) const } #ifdef __WXWINCE__ -extern "C" int __cdecl +extern "C" +{ +static int __cdecl #else -extern "C" int LINKAGEMODE +extern "C" +{ +static int LINKAGEMODE #endif wx_comparestrings(const void *arg1, const void *arg2) @@ -714,6 +718,8 @@ wx_comparestrings(const void *arg1, const void *arg2) 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 void wxStringList::Sort() { diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp index 6a6ea742c0..0bb02d568d 100644 --- a/src/common/zipstrm.cpp +++ b/src/common/zipstrm.cpp @@ -140,7 +140,7 @@ static wxFileOffset QuietSeek(wxInputStream& stream, wxFileOffset pos) ///////////////////////////////////////////////////////////////////////////// // Class factory -wxZipClassFactory g_wxZipClassFactory; +static wxZipClassFactory g_wxZipClassFactory; wxZipClassFactory::wxZipClassFactory() { @@ -2318,7 +2318,7 @@ bool wxZipOutputStream::Close() m_lasterror = m_parent_o_stream->GetLastError(); m_endrecWritten = true; - + if (!wxFilterOutputStream::Close() || !IsOk()) return false; m_lasterror = wxSTREAM_EOF; diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 6daa233208..e9010bfa73 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -435,7 +435,7 @@ public: bool m_sendSetColumnWidth; int m_colToSend; int m_widthToSend; - + virtual void OnInternalIdle(); private: @@ -1798,7 +1798,7 @@ void wxListHeaderWindow::AdjustDC(wxDC& dc) void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { wxGenericListCtrl *parent = m_owner->GetListCtrl(); - + wxPaintDC dc( this ); AdjustDC( dc ); @@ -1936,7 +1936,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) void wxListHeaderWindow::OnInternalIdle() { wxWindow::OnInternalIdle(); - + if (m_sendSetColumnWidth) { m_owner->SetColumnWidth( m_colToSend, m_widthToSend ); @@ -1980,7 +1980,7 @@ void wxListHeaderWindow::DrawCurrent() void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) { wxGenericListCtrl *parent = m_owner->GetListCtrl(); - + // we want to work with logical coords int x; parent->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL); @@ -3791,7 +3791,7 @@ void wxListMainWindow::SetColumnWidth( int col, int width ) wxCHECK_RET( InReportView(), _T("SetColumnWidth() can only be called in report mode.") ); - + m_dirty = true; wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin; @@ -4889,8 +4889,8 @@ int wxListMainWindow::GetItemWidthWithImage(wxListItem * item) // sorting // ---------------------------------------------------------------------------- -wxListCtrlCompare list_ctrl_compare_func_2; -long list_ctrl_compare_data; +static wxListCtrlCompare list_ctrl_compare_func_2; +static long list_ctrl_compare_data; int LINKAGEMODE list_ctrl_compare_func_1( wxListLineData **arg1, wxListLineData **arg2 ) { @@ -4924,7 +4924,7 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data ) void wxListMainWindow::OnScroll(wxScrollWinEvent& event) { wxPrintf( "wxListMainWindow::OnScroll\n" ); - + // HandleOnScroll( event ); // update our idea of which lines are shown when we redraw the window the @@ -5030,7 +5030,7 @@ void wxGenericListCtrl::CreateOrDestroyHeaderWindowAsNeeded() { bool needs_header = HasHeader(); bool has_header = (m_headerWin != NULL); - + if (needs_header == has_header) return; @@ -5043,7 +5043,7 @@ void wxGenericListCtrl::CreateOrDestroyHeaderWindowAsNeeded() wxSize(GetClientSize().x, m_headerHeight), wxTAB_TRAVERSAL ); - + #if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON wxFont font; #if wxOSX_USE_ATSU_TEXT @@ -5053,15 +5053,15 @@ void wxGenericListCtrl::CreateOrDestroyHeaderWindowAsNeeded() #endif m_headerWin->SetFont( font ); #endif - + GetSizer()->Prepend( m_headerWin, 0, wxGROW ); } else { GetSizer()->Detach( m_headerWin ); - + delete m_headerWin; - + m_headerWin = NULL; } } @@ -5086,16 +5086,16 @@ bool wxGenericListCtrl::Create(wxWindow *parent, #ifdef __WXGTK__ style &= ~wxBORDER_MASK; style |= wxBORDER_THEME; -#endif +#endif m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0, 0), size, style ); SetTargetWindow( m_mainWin ); - + wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL ); sizer->Add( m_mainWin, 1, wxGROW ); SetSizer( sizer ); - + CreateOrDestroyHeaderWindowAsNeeded(); SetInitialSize(size); @@ -5193,7 +5193,7 @@ void wxGenericListCtrl::SetWindowStyleFlag( long flag ) // m_mainWin->DeleteEverything(); wxMSW doesn't do that CreateOrDestroyHeaderWindowAsNeeded(); - + GetSizer()->Layout(); } @@ -5540,7 +5540,7 @@ bool wxGenericListCtrl::DeleteColumn( int col ) // if we don't have the header any longer, we need to relayout the window // if ( !GetColumnCount() ) - + return true; } @@ -5688,7 +5688,7 @@ void wxGenericListCtrl::OnSize(wxSizeEvent& WXUNUSED(event)) Layout(); m_mainWin->RecalculatePositions(); - + AdjustScrollbars(); } diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp index 9b9b8d25de..7eddd4a943 100644 --- a/src/html/m_layout.cpp +++ b/src/html/m_layout.cpp @@ -83,9 +83,12 @@ private: }; // 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 -- 2.45.2