Some fixes for gcc compilation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/configtool/src/Makefile b/utils/configtool/src/Makefile
index d8103b5e4cbdf360c53f24d0c1c2d49efcc4f066..db7134529371f1f03a03e7b47aa9277991b5930f 100644 (file)
--- a/utils/configtool/src/Makefile
+++ b/utils/configtool/src/Makefile
@@ -63,10 +63,12 @@ APPEXTRADEFS= \
 
 #  -I$(UTILSDIR) \
 
 
 #  -I$(UTILSDIR) \
 

-WXVERSION=2.4
+WXVERSION=2.5

 
 # Use the small C++ support library
 
 # Use the small C++ support library

-APPEXTRALIBS=-lsupc++ ${top_builddir}/lib/libwx_$(WXTOOLKIT)$(WXDEBUGSUFFIX)_xrc-$(WXVERSION).a
+APPEXTRALIBS=-lsupc++
+
+# ${top_builddir}/lib/libwx_$(WXTOOLKIT)$(WXDEBUGSUFFIX)_xrc-$(WXVERSION).a

 
 PLATFORM_OS=$(shell echo $(OS))
 
 
 PLATFORM_OS=$(shell echo $(OS))
 


@@ -211,7 +213,7 @@ $(APPBUILDDIR)/property.o: $(APPSRCDIR)/property.cpp $(APPINCDIR)/property.h $(A
 $(APPBUILDDIR)/settingsdialog.o: $(APPSRCDIR)/settingsdialog.cpp $(APPINCDIR)/settingsdialog.h $(APPSRCDIR)/symbols.h
        $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 
 $(APPBUILDDIR)/settingsdialog.o: $(APPSRCDIR)/settingsdialog.cpp $(APPINCDIR)/settingsdialog.h $(APPSRCDIR)/symbols.h
        $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 

-$(APPBUILDDIR)/utils.o: $(APPSRCDIR)/utils.cpp $(APPINCDIR)/imagewindow.h $(APPSRCDIR)/symbols.h
+$(APPBUILDDIR)/utils.o: $(APPSRCDIR)/utils.cpp $(APPINCDIR)/utils.h $(APPSRCDIR)/symbols.h

        $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 
 $(APPBUILDDIR)/wxconfigtool_resources.o: $(APPSRCDIR)/wxconfigtool.rc
        $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 
 $(APPBUILDDIR)/wxconfigtool_resources.o: $(APPSRCDIR)/wxconfigtool.rc

diff --git a/utils/configtool/src/appsettings.cpp b/utils/configtool/src/appsettings.cpp
index 69fd5a3d52bc6622444a3e0c2e1641d0f38958fd..41cbfccc055c692453f330966e971f8dcd07a912 100644 (file)
--- a/utils/configtool/src/appsettings.cpp
+++ b/utils/configtool/src/appsettings.cpp
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation appsettings.h
+#pragma implementation "appsettings.h"

 #endif
 
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"

diff --git a/utils/configtool/src/appsettings.h b/utils/configtool/src/appsettings.h
index 8a529fc82ae8e4f3308bdd0678a3a3ef4aaf00e7..ac218f6d2143216bcd89e692e4f25ee4413adec6 100644 (file)
--- a/utils/configtool/src/appsettings.h
+++ b/utils/configtool/src/appsettings.h
@@ -13,7 +13,7 @@
 #define _AP_APPSETTINGS_H_
 
 #ifdef __GNUG__
 #define _AP_APPSETTINGS_H_
 
 #ifdef __GNUG__

-#pragma interface appsettings.cpp
+#pragma interface "appsettings.cpp"

 #endif
 
 #include "wx/notebook.h"
 #endif
 
 #include "wx/notebook.h"

diff --git a/utils/configtool/src/configitem.cpp b/utils/configtool/src/configitem.cpp
index 2db7ac8e7aa6af32d92547d7c898adca161acdac..ca5c26827000586a4cd5c0d1971cc70a85338f11 100644 (file)
--- a/utils/configtool/src/configitem.cpp
+++ b/utils/configtool/src/configitem.cpp
@@ -128,7 +128,7 @@ ctConfigItem* ctConfigItem::GetChild(int n) const
 
     if ( n < GetChildCount() && n > -1 )
     {
 
     if ( n < GetChildCount() && n > -1 )
     {

-        ctConfigItem* child = wxDynamicCast(m_children.Nth(n)->Data(), ctConfigItem);
+        ctConfigItem* child = wxDynamicCast(m_children.Item(n)->GetData(), ctConfigItem);

         return child;
     }
     else
         return child;
     }
     else

diff --git a/utils/configtool/src/configitemselector.cpp b/utils/configtool/src/configitemselector.cpp
index 35b6ae10bc8b7c6e6fad6ffeac66ff5021aecd53..c6f96d442a506b58c58351d5db16b52d640fe6e6 100644 (file)
--- a/utils/configtool/src/configitemselector.cpp
+++ b/utils/configtool/src/configitemselector.cpp
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation configitemselector.cpp
+#pragma implementation "configitemselector.h"

 #endif
 
 #include <wx/wx.h>
 #endif
 
 #include <wx/wx.h>

diff --git a/utils/configtool/src/configitemselector.h b/utils/configtool/src/configitemselector.h
index 7b705736ae0c408c9107f3b7e3d6f0a2f61208e7..7946d034ff15b5de3176546316a00941aa2b8be3 100644 (file)
--- a/utils/configtool/src/configitemselector.h
+++ b/utils/configtool/src/configitemselector.h
@@ -13,7 +13,7 @@
 #define _CONFIGITEMSELECTOR_H_
 
 #ifdef __GNUG__
 #define _CONFIGITEMSELECTOR_H_
 
 #ifdef __GNUG__

-#pragma interface configitemselector.h
+#pragma interface "configitemselector.cpp"

 #endif
 
 /*!
 #endif
 
 /*!

diff --git a/utils/configtool/src/configtooldoc.cpp b/utils/configtool/src/configtooldoc.cpp
index d5ae2a8b244534151e01a5946512716bd1f09c8e..5dd41d2461976c1876122658d04ee373ff890ac5 100644 (file)
--- a/utils/configtool/src/configtooldoc.cpp
+++ b/utils/configtool/src/configtooldoc.cpp
@@ -352,7 +352,7 @@ bool ctConfigToolDoc::DoSave(ctConfigItem* item, wxOutputStream& stream, int ind
         stream << ctEscapeHTMLCharacters(prop->GetVariant().GetString()) ;
         stream << wxT("</") << prop->GetName() << wxT(">");
 
         stream << ctEscapeHTMLCharacters(prop->GetVariant().GetString()) ;
         stream << wxT("</") << prop->GetName() << wxT(">");
 

-        node = node->Next();
+        node = node->GetNext();

     }
 
     // Output children
     }
 
     // Output children


@@ -362,7 +362,7 @@ bool ctConfigToolDoc::DoSave(ctConfigItem* item, wxOutputStream& stream, int ind
         ctConfigItem* child = (ctConfigItem*) node->GetData();
         DoSave(child, stream, indent);
 
         ctConfigItem* child = (ctConfigItem*) node->GetData();
         DoSave(child, stream, indent);
 

-        node = node->Next();
+        node = node->GetNext();

     }
 
     indent --;
     }
 
     indent --;

diff --git a/utils/configtool/src/configtoolview.cpp b/utils/configtool/src/configtoolview.cpp
index 10cb368559b9f6549d72b50bd04520c0de9caafe..c9549799ab24e386aa26606d9667cb11d49447e1 100644 (file)
--- a/utils/configtool/src/configtoolview.cpp
+++ b/utils/configtool/src/configtoolview.cpp
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-    #pragma implementation "configtoolview.cpp"
+    #pragma implementation "configtoolview.h"

 #endif
 
 // Includes other headers for precompiled compilation
 #endif
 
 // Includes other headers for precompiled compilation


@@ -448,8 +448,9 @@ void ctConfigToolView::OnDeleteItem(wxCommandEvent& event)
     ctConfigItem* sel = GetSelection();
     if (sel)
     {
     ctConfigItem* sel = GetSelection();
     if (sel)
     {

+        wxString name(sel->GetName());

         wxString msg;
         wxString msg;

-        msg.Printf(_("Delete %s?"), sel->GetName());
+        msg.Printf(_("Delete %s?"), (const wxChar*) name);

         if (wxYES == wxMessageBox(msg, _("Delete item"), wxICON_QUESTION|wxYES_NO))
         {
             wxGetApp().GetMainFrame()->GetConfigTreeCtrl()->Delete(sel->GetTreeItemId());
         if (wxYES == wxMessageBox(msg, _("Delete item"), wxICON_QUESTION|wxYES_NO))
         {
             wxGetApp().GetMainFrame()->GetConfigTreeCtrl()->Delete(sel->GetTreeItemId());

diff --git a/utils/configtool/src/configtree.cpp b/utils/configtool/src/configtree.cpp
index 3da10101fb9225d02f906a3fcae5dd09d6783f34..40d70f9c90c6c6ae24499198819205e9f86a2abc 100644 (file)
--- a/utils/configtool/src/configtree.cpp
+++ b/utils/configtool/src/configtree.cpp
@@ -24,8 +24,6 @@
 #include "wx/cshelp.h"
 
 // Include XPM icons
 #include "wx/cshelp.h"
 
 // Include XPM icons

-#include "bitmaps/folder1.xpm"
-

 #include "bitmaps/closedfolder.xpm"
 #include "bitmaps/closedfolder_dis.xpm"
 
 #include "bitmaps/closedfolder.xpm"
 #include "bitmaps/closedfolder_dis.xpm"
 

diff --git a/utils/configtool/src/custompropertydialog.cpp b/utils/configtool/src/custompropertydialog.cpp
index ef631a4474a01864147ba9d67c531826f3dca515..9bf09e750a7a3e28fc7e35fe662d527cbb65081e 100644 (file)
--- a/utils/configtool/src/custompropertydialog.cpp
+++ b/utils/configtool/src/custompropertydialog.cpp
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation custompropertydialog.h
+#pragma implementation "custompropertydialog.h"

 #endif
 
 #include <wx/wx.h>
 #endif
 
 #include <wx/wx.h>

diff --git a/utils/configtool/src/custompropertydialog.h b/utils/configtool/src/custompropertydialog.h
index ffaff8f8590608a59f8916ad90e14f47449c1d6f..28488de734c5bef72277d0fc9f139c1f328aa7a1 100644 (file)
--- a/utils/configtool/src/custompropertydialog.h
+++ b/utils/configtool/src/custompropertydialog.h
@@ -13,7 +13,7 @@
 #define _CUSTOMPROPERTYDIALOG_H_
 
 #ifdef __GNUG__
 #define _CUSTOMPROPERTYDIALOG_H_
 
 #ifdef __GNUG__

-#pragma interface custompropertydialog.cpp
+#pragma interface "custompropertydialog.cpp"

 #endif
 
 /*!
 #endif
 
 /*!

diff --git a/utils/configtool/src/htmlparser.h b/utils/configtool/src/htmlparser.h
index b03e23c0fb9d2a1c3d996c2495e6239193b9495b..3c539914d14da62b76a099986a0717d6555b03a2 100644 (file)
--- a/utils/configtool/src/htmlparser.h
+++ b/utils/configtool/src/htmlparser.h
@@ -13,7 +13,7 @@
 #define _HTMLPARSER_H_
 
 #ifdef __GNUG__
 #define _HTMLPARSER_H_
 
 #ifdef __GNUG__

-    #pragma interface "htmlparser.h"
+    #pragma interface "htmlparser.cpp"

 #endif
 
 //#include "wx/module.h"
 #endif
 
 //#include "wx/module.h"

diff --git a/utils/configtool/src/mainframe.cpp b/utils/configtool/src/mainframe.cpp
index 5e967a397683124a17bba547850baacc42033aeb..e0d9d7978866f0c908f7a5758f651b7fb594e145 100644 (file)
--- a/utils/configtool/src/mainframe.cpp
+++ b/utils/configtool/src/mainframe.cpp
@@ -9,6 +9,10 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 

+#ifdef __GNUG__
+#pragma implementation "mainframe.h"
+#endif
+

 #include "wx/wx.h"
 
 #ifdef __BORLANDC__
 #include "wx/wx.h"
 
 #ifdef __BORLANDC__


@@ -209,7 +213,7 @@ void ctMainFrame::InitToolBar(wxToolBar* toolBar)
     toolBarBitmaps[3] = wxBitmap(copy_xpm);
     toolBarBitmaps[4] = wxBitmap(cut_xpm);
     toolBarBitmaps[5] = wxBitmap(paste_xpm);
     toolBarBitmaps[3] = wxBitmap(copy_xpm);
     toolBarBitmaps[4] = wxBitmap(cut_xpm);
     toolBarBitmaps[5] = wxBitmap(paste_xpm);

-    toolBarBitmaps[6] = wxBitmap(print_xpm);
+//    toolBarBitmaps[6] = wxBitmap(print_xpm);

     toolBarBitmaps[7] = wxBitmap(help_xpm);
     toolBarBitmaps[10] = wxBitmap(undo_xpm);
     toolBarBitmaps[11] = wxBitmap(redo_xpm);
     toolBarBitmaps[7] = wxBitmap(help_xpm);
     toolBarBitmaps[10] = wxBitmap(undo_xpm);
     toolBarBitmaps[11] = wxBitmap(redo_xpm);

diff --git a/utils/configtool/src/mainframe.h b/utils/configtool/src/mainframe.h
index 1e53bbc25e300b5ba756187e00950368082a63e6..d8c9460753125f2209ebb250ea50266952dba38a 100644 (file)
--- a/utils/configtool/src/mainframe.h
+++ b/utils/configtool/src/mainframe.h
@@ -12,6 +12,10 @@
 #ifndef _AP_MAINFRAME_H_
 #define _AP_MAINFRAME_H_
 
 #ifndef _AP_MAINFRAME_H_
 #define _AP_MAINFRAME_H_
 

+#ifdef __GNUG__
+#pragma interface "mainframe.cpp"
+#endif
+

 #include "wx/imaglist.h"
 #include "wx/docview.h"
 
 #include "wx/imaglist.h"
 #include "wx/docview.h"
 

diff --git a/utils/configtool/src/property.cpp b/utils/configtool/src/property.cpp
index edaf2e31ecddcf68357aedb1fc94fa02d7d8c7b2..fa09d728705b85ed8d36ddee1efcd3fce642698d 100644 (file)
--- a/utils/configtool/src/property.cpp
+++ b/utils/configtool/src/property.cpp
@@ -158,7 +158,7 @@ ctProperty* ctProperties::GetNth(int i) const
     wxASSERT( i < (int) GetCount() );
     if (i < (int) GetCount())
     {
     wxASSERT( i < (int) GetCount() );
     if (i < (int) GetCount())
     {

-        wxNode* node = m_list.Nth(i);
+        wxNode* node = m_list.Item(i);

         return (ctProperty*) node->GetData();
     }
     return NULL;
         return (ctProperty*) node->GetData();
     }
     return NULL;


@@ -229,4 +229,4 @@ void ctProperties::RemoveHiddenProperties()
         node = next;
     }
 }
         node = next;
     }
 }

-#endif
\ No newline at end of file
+#endif

diff --git a/utils/configtool/src/settingsdialog.cpp b/utils/configtool/src/settingsdialog.cpp
index fc0239fd7a1c72157a165cbc5b2492f0c2a32aa1..7bcb2fb02204fa9b8794897dbad56b7feae2bb28 100644 (file)
--- a/utils/configtool/src/settingsdialog.cpp
+++ b/utils/configtool/src/settingsdialog.cpp
@@ -9,6 +9,10 @@
 // Licence:     
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     
 /////////////////////////////////////////////////////////////////////////////
 

+#ifdef __GNUG__
+#pragma implementation "settingsdialog.h"
+#endif
+

 #include "wx/wx.h"
 #include "wx/cshelp.h"
 #include "wx/statline.h"
 #include "wx/wx.h"
 #include "wx/cshelp.h"
 #include "wx/statline.h"

diff --git a/utils/configtool/src/settingsdialog.h b/utils/configtool/src/settingsdialog.h
index 2efcd63667e5670c33ddde4a990a847048a645f0..bee8b64381fb3610142a2d36bfe3e1d0375e1a42 100644 (file)
--- a/utils/configtool/src/settingsdialog.h
+++ b/utils/configtool/src/settingsdialog.h
@@ -12,6 +12,10 @@
 #ifndef _SETTINGSDIALOG_H_
 #define _SETTINGSDIALOG_H_
 
 #ifndef _SETTINGSDIALOG_H_
 #define _SETTINGSDIALOG_H_
 

+#ifdef __GNUG__
+#pragma interface "settingsdialog.cpp"
+#endif
+

 /*!
  * Includes
  */
 /*!
  * Includes
  */

diff --git a/utils/configtool/src/utils.cpp b/utils/configtool/src/utils.cpp
index d1bdefb5143ac7f8cf95340365cbff444e7cc564..2be69b4ab8f3097ce5fabd4ff997661327a55346 100644 (file)
--- a/utils/configtool/src/utils.cpp
+++ b/utils/configtool/src/utils.cpp
@@ -405,13 +405,13 @@ bool wxIconTable::AddInfo(const wxString& name, const wxIcon& icon, int state, b
 
 wxIconInfo* wxIconTable::FindInfo(const wxString& name) const
 {
 
 wxIconInfo* wxIconTable::FindInfo(const wxString& name) const
 {

-    wxNode* node = First();
+    wxNode* node = GetFirst();

     while (node)
     {
     while (node)
     {

-        wxIconInfo* info = (wxIconInfo*) node->Data();
+        wxIconInfo* info = (wxIconInfo*) node->GetData();

         if (info->GetName() == name)
             return info;
         if (info->GetName() == name)
             return info;

-        node = node->Next();
+        node = node->GetNext();

     }
     return NULL;
 }
     }
     return NULL;
 }


@@ -474,4 +474,4 @@ wxString ctEscapeHTMLCharacters(const wxString& str)
             s += c;
     }
     return s;
             s += c;
     }
     return s;

-}
\ No newline at end of file
+}

diff --git a/utils/configtool/src/wxconfigtool.cpp b/utils/configtool/src/wxconfigtool.cpp
index f667b1b632da609dfcea6958aa54d5a3380ea592..17fbe701dbc1648d88d3e3fb0253b74ae16acf72 100644 (file)
--- a/utils/configtool/src/wxconfigtool.cpp
+++ b/utils/configtool/src/wxconfigtool.cpp
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation wxconfigtool.h
+#pragma implementation "wxconfigtool.h"

 #endif
 
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"

diff --git a/utils/configtool/src/wxconfigtool.h b/utils/configtool/src/wxconfigtool.h
index a38fca2140543a12c8b352ce9f54bc4de00a3dfe..72ed69e763f5ac97224cbb999de9864bee538bdd 100644 (file)
--- a/utils/configtool/src/wxconfigtool.h
+++ b/utils/configtool/src/wxconfigtool.h
@@ -13,7 +13,7 @@
 #define _AP_WXCONFIGTOOL_H_
 
 #ifdef __GNUG__
 #define _AP_WXCONFIGTOOL_H_
 
 #ifdef __GNUG__

-#pragma interface wxconfigtool.cpp
+#pragma interface "wxconfigtool.cpp"

 #endif
 
 #include "wx/docview.h"
 #endif
 
 #include "wx/docview.h"

diff --git a/utils/configtool/src/wxconfigtool.rc b/utils/configtool/src/wxconfigtool.rc
index a885666454cc130cb31843c4202f7222dda5c446..27e1424eb5c105fa48bdd234d6ce4062aa7cf792 100644 (file)
--- a/utils/configtool/src/wxconfigtool.rc
+++ b/utils/configtool/src/wxconfigtool.rc
@@ -4,5 +4,8 @@ wxconfigtool              ICON    "bitmaps/wxconfigtool.ico"
 
 #include "wx/msw/wx.rc"
 
 
 #include "wx/msw/wx.rc"
 

+/* Use if compiling with earlier versions of wxWindows */
+#if 0

 1 24 "wxconfigtool.exe.manifest"
 1 24 "wxconfigtool.exe.manifest"

+#endif