Bug#749978: #749978: guayadeque: Please update to use wxwidgets3.0

[Damyan Ivanov]

-=| Olly Betts, 23.06.2014 11:00:14 +0100 |=-
> On Mon, Jun 23, 2014 at 12:50:11PM +0300, Damyan Ivanov wrote:
> > /tmp/buildd/guayadeque-0.3.7~ds0/src/ListView.h:160:5: error: 'wxImageList' 
> > does not name a type
> >      wxImageList *           m_ImageList;
> >      ^
> 
> For this (and the similar errors for other missing classes) you probably
> just need to explicitly include the appropriate wx/xxxx.h header which
> declares the missing class.

Thanks. Attached is a patch that fixes these (until the build fails 
with other errors).

> Not sure about the other issues off the top of my head.

Sure. I guess the rest needs somebody deeper in C++ than me then.

-- dam

--- a/src/ListView.h
+++ b/src/ListView.h
@@ -28,6 +28,7 @@
 #include <wx/scrolwin.h>
 #include <wx/vlbox.h>
 #include <wx/settings.h>
+#include <wx/listbase.h>
 
 class guListViewClient;
 class guListViewHeader;
--- a/src/FileBrowser.cpp
+++ b/src/FileBrowser.cpp
@@ -36,6 +36,7 @@
 #include <wx/arrimpl.cpp>
 #include <wx/artprov.h>
 #include <wx/clipbrd.h>
+#include <wx/gtk/tglbtn.h>
 
 WX_DEFINE_OBJARRAY(guFileItemArray);
 
@@ -221,7 +222,7 @@ guFileBrowserDirCtrl::guFileBrowserDirCt
 
 	DirBtnSizer->Add( 0, 0, 1, wxEXPAND, 5 );
 
-	m_ShowLibPathsBtn = new wxToggleBitmapButton( this, wxID_ANY, guImage( guIMAGE_INDEX_tiny_library ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+	m_ShowLibPathsBtn = new wxBitmapToggleButton( this, wxID_ANY, guImage( guIMAGE_INDEX_tiny_library ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
     m_ShowLibPathsBtn->SetToolTip( ShowPaths == guFILEBROWSER_SHOWPATH_SYSTEM ?
                           _( "See used locations" ) :
                           _( "See system files" ) );
--- a/src/FileBrowser.h
+++ b/src/FileBrowser.h
@@ -36,6 +36,7 @@
 #include <wx/sizer.h>
 #include <wx/string.h>
 #include <wx/tglbtn.h>
+#include <wx/gtk/tglbtn.h>
 
 
 #define     guPANEL_FILEBROWSER_DIRCTRL             ( 1 << 0 )
@@ -122,7 +123,7 @@ class guFileBrowserDirCtrl : public wxPa
     guMediaViewer *     m_MediaViewer;
     guGenericDirCtrl *  m_DirCtrl;
     bool                m_AddingFolder;
-    wxToggleBitmapButton *  m_ShowLibPathsBtn;
+    wxBitmapToggleButton *  m_ShowLibPathsBtn;
 
     void                OnShowLibPathsClick( wxCommandEvent& event );
 
--- a/src/AuiNotebook.cpp
+++ b/src/AuiNotebook.cpp
@@ -389,6 +389,8 @@ void guAuiNotebook::UpdateTabCtrlHeight(
         tabctrl->SetArtProvider(art->Clone());
         tab_frame->DoSizing();
     }
+
+    return true;
 }
 
 // -------------------------------------------------------------------------------- //
--- a/src/AuiNotebook.h
+++ b/src/AuiNotebook.h
@@ -205,7 +205,7 @@ class guAuiNotebook : public wxAuiNotebo
 
     virtual ~guAuiNotebook();
 
-    virtual void UpdateTabCtrlHeight();
+    virtual bool UpdateTabCtrlHeight();
 
     wxString SavePerspective( void );
  	bool LoadPerspective( const wxString &layout );