Build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -115,7 +115,6 @@ install::
|
|||||||
$(INSTALL_DATA) $(WXBASEDIR)/lib/$(OS)/$(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)
|
$(INSTALL_DATA) $(WXBASEDIR)/lib/$(OS)/$(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)
|
||||||
@if test -f $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) ; then \
|
@if test -f $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) ; then \
|
||||||
echo " Copying shared library" ; \
|
echo " Copying shared library" ; \
|
||||||
@cd $(WXBASEDIR)/src ; \
|
|
||||||
rm -f $(libdir)/lib$(LIB_TARGET).so* ; \
|
rm -f $(libdir)/lib$(LIB_TARGET).so* ; \
|
||||||
$(INSTALL_PROGRAM) $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) $(libdir)/$(SHARED_LIBRARY) ; \
|
$(INSTALL_PROGRAM) $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) $(libdir)/$(SHARED_LIBRARY) ; \
|
||||||
$(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so.$(LIB_MAJOR) ; \
|
$(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so.$(LIB_MAJOR) ; \
|
||||||
|
@@ -80,12 +80,12 @@
|
|||||||
|
|
||||||
#define _MAXPATHLEN 500
|
#define _MAXPATHLEN 500
|
||||||
|
|
||||||
#if !USE_SHARED_LIBRARY
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
extern char *wxBuffer;
|
extern char *wxBuffer;
|
||||||
|
|
||||||
|
#if !USE_SHARED_LIBRARIES
|
||||||
|
IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
|
||||||
|
#endif
|
||||||
|
|
||||||
void wxPathList::Add (const wxString& path)
|
void wxPathList::Add (const wxString& path)
|
||||||
{
|
{
|
||||||
wxStringList::Add ((char *)(const char *)path);
|
wxStringList::Add ((char *)(const char *)path);
|
||||||
|
@@ -2553,6 +2553,14 @@ wxPrintPaperType::~wxPrintPaperType()
|
|||||||
delete[] pageName;
|
delete[] pageName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Print paper database for PostScript
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if !USE_SHARED_LIBRARIES
|
||||||
|
IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperDatabase, wxList)
|
||||||
|
#endif
|
||||||
|
|
||||||
wxPrintPaperDatabase::wxPrintPaperDatabase():wxList(wxKEY_STRING)
|
wxPrintPaperDatabase::wxPrintPaperDatabase():wxList(wxKEY_STRING)
|
||||||
{
|
{
|
||||||
DeleteContents(TRUE);
|
DeleteContents(TRUE);
|
||||||
|
@@ -849,7 +849,14 @@ void wxExpr::WriteLispExpr(ostream& stream)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// wxExpr 'database' (list of expressions)
|
/*
|
||||||
|
* wxExpr 'database' (list of expressions)
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if !USE_SHARED_LIBRARIES
|
||||||
|
IMPLEMENT_DYNAMIC_CLASS(wxExprDatabase, wxList)
|
||||||
|
#endif
|
||||||
|
|
||||||
wxExprDatabase::wxExprDatabase(wxExprErrorHandler handler)
|
wxExprDatabase::wxExprDatabase(wxExprErrorHandler handler)
|
||||||
{
|
{
|
||||||
position = NULL;
|
position = NULL;
|
||||||
|
Reference in New Issue
Block a user