- Fix build with gcc 4.X

PR:		ports/107048
Submitted by:	Matthias Sund<m.sund@arcor.de> (maintainer)
This commit is contained in:
Martin Wilke 2006-12-21 23:19:58 +00:00
parent d35f009a81
commit b662f715a4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=180437
5 changed files with 71 additions and 0 deletions

View file

@ -0,0 +1,11 @@
--- sdk/editormanager.h.orig Wed Dec 20 23:49:21 2006
+++ sdk/editormanager.h Wed Dec 20 23:50:21 2006
@@ -126,7 +126,7 @@
/** Builds Opened Files tree in the Projects tab
*/
- wxTreeCtrl *EditorManager::GetTree();
+ wxTreeCtrl *GetTree();
wxTreeItemId FindTreeFile(const wxString& filename);
wxString GetTreeItemFilename(wxTreeItemId item);
void BuildOpenedFilesTree(wxWindow* parent);

View file

@ -0,0 +1,13 @@
--- sdk/managedthread.h.orig Thu Dec 21 00:02:41 2006
+++ sdk/managedthread.h Thu Dec 21 00:03:05 2006
@@ -11,8 +11,8 @@
class ManagedThread : public wxThread
{
public:
- ManagedThread::ManagedThread(bool* abortflag = 0L);
- virtual ManagedThread::~ManagedThread();
+ ManagedThread(bool* abortflag = 0L);
+ virtual ~ManagedThread();
static unsigned long count_running();
static unsigned long count_threads();
static void abort_all(); // Warning! Once set, can't be reset!

View file

@ -0,0 +1,25 @@
--- sdk/xtra_classes.h.orig Wed Dec 20 23:59:57 2006
+++ sdk/xtra_classes.h Thu Dec 21 00:00:55 2006
@@ -18,8 +18,8 @@
class wxSplitPanel : public wxPanel
{
public:
- wxSplitPanel::wxSplitPanel() { /*nothing to init, really */ }
- wxSplitPanel::wxSplitPanel(wxWindow* parent, wxWindowID id = -1,
+ wxSplitPanel() { /*nothing to init, really */ }
+ wxSplitPanel(wxWindow* parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL, const wxString& name = _T("splitpanel"),const wxString configname = wxEmptyString,int defaultsashposition = 150)
{
@@ -33,9 +33,9 @@
* If only one is found, the panel is not split.
*
*/
- void wxSplitPanel::RefreshSplitter(int idtop,int idbottom);
+ void RefreshSplitter(int idtop,int idbottom);
- virtual wxSplitPanel::~wxSplitPanel();
+ virtual ~wxSplitPanel();
wxSplitterWindow* GetSplitter() { return (this) ? m_splitter : 0L; }
void SetConfigEntryForSplitter(const wxString& splitterconfig){ m_SplitterConfig = splitterconfig; }
protected:

View file

@ -0,0 +1,11 @@
--- src/main.cpp.orig Thu Dec 21 00:18:40 2006
+++ src/main.cpp Thu Dec 21 00:19:06 2006
@@ -65,7 +65,7 @@
class wxMyFileDropTarget : public wxFileDropTarget
{
public:
- wxMyFileDropTarget::wxMyFileDropTarget(MainFrame *frame):m_frame(frame){}
+ wxMyFileDropTarget(MainFrame *frame):m_frame(frame){}
virtual bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames)
{
if(!m_frame) return false;

View file

@ -0,0 +1,11 @@
--- src/wxDockit/include/wx/barholder.h.orig Thu Dec 21 00:14:59 2006
+++ src/wxDockit/include/wx/barholder.h Thu Dec 21 00:15:51 2006
@@ -39,7 +39,7 @@
}
// Normal constructor
- wxBarHolder::wxBarHolder( wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
+ wxBarHolder( wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = wxT("barholder") ) {
Init();