mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-24 08:43:27 +00:00
Code Issues Releases Wiki Activity

portability for wx 2.6 and for both unicode and ascii builds of wxWidgets

Browse source
This commit is contained in:
Charles Kerr 2007-07-20 02:12:07 +00:00
parent dbbaf168aa
commit 6c093a322a
1 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
wx/xmission.cc
View file

@ -13,7 +13,6 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <iostream> #include <iostream>
#include <wx/aboutdlg.h>
#include <wx/artprov.h> #include <wx/artprov.h>
#include <wx/defs.h> #include <wx/defs.h>
#include <wx/config.h> #include <wx/config.h>
@ -21,6 +20,9 @@
#include <wx/splitter.h> #include <wx/splitter.h>
#include <wx/notebook.h> #include <wx/notebook.h>
#include <wx/wx.h> #include <wx/wx.h>
#if wxCHECK_VERSION(2,8,0)
#include <wx/aboutdlg.h>
#endif
extern "C" { extern "C" {
#include <libtransmission/transmission.h> #include <libtransmission/transmission.h>
} }
@ -138,31 +140,30 @@ namespace
N_COLS N_COLS
}; };
int getTorrentColumn( const wxString& wxKey ) int getTorrentColumn( const wxString& key )
{ {
const std::string key ( wxKey.c_str() ); typedef std::map<wxString,int> string2key_t;
typedef std::map<std::string,int> string2key_t;
static string2key_t columns; static string2key_t columns;
if( columns.empty() ) if( columns.empty() )
{ {
columns["#"] = COL_NUMBER; columns[_T("#")] = COL_NUMBER;
columns["done"] = COL_DONE; columns[_T("done")] = COL_DONE;
columns["dspeed"] = COL_DOWNLOAD_SPEED; columns[_T("dspeed")] = COL_DOWNLOAD_SPEED;
columns["eta"] = COL_ETA; columns[_T("eta")] = COL_ETA;
columns["hash"] = COL_HASH; columns[_T("hash")] = COL_HASH;
columns["name"] = COL_NAME; columns[_T("name")] = COL_NAME;
columns["peers"] = COL_PEERS; columns[_T("peers")] = COL_PEERS;
columns["ratio"] = COL_RATIO; columns[_T("ratio")] = COL_RATIO;
columns["received"] = COL_RECEIVED; columns[_T("received")] = COL_RECEIVED;
columns["remaining"] = COL_REMAINING; columns[_T("remaining")] = COL_REMAINING;
columns["seeds"] = COL_SEEDS; columns[_T("seeds")] = COL_SEEDS;
columns["sent"] = COL_SEND; columns[_T("sent")] = COL_SEND;
columns["size"] = COL_SIZE; columns[_T("size")] = COL_SIZE;
columns["state"] = COL_STATE; columns[_T("state")] = COL_STATE;
columns["status"] = COL_STATUS; columns[_T("status")] = COL_STATUS;
columns["total"] = COL_TOTAL; columns[_T("total")] = COL_TOTAL;
columns["uspeed"] = COL_UPLOAD_SPEED; columns[_T("uspeed")] = COL_UPLOAD_SPEED;
} }
int i = -1; int i = -1;
@ -378,6 +379,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
wxIcon ico; wxIcon ico;
ico.CopyFromBitmap( wxBitmap( transmission_logo ) ); ico.CopyFromBitmap( wxBitmap( transmission_logo ) );
#if wxCHECK_VERSION(2,8,0)
wxAboutDialogInfo info; wxAboutDialogInfo info;
info.SetName(_T("Xmission")); info.SetName(_T("Xmission"));
info.SetVersion(_T(LONG_VERSION_STRING)); info.SetVersion(_T(LONG_VERSION_STRING));
@ -391,4 +393,11 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
info.AddDeveloper( "Eric Petit (Back-end; OS X)" ); info.AddDeveloper( "Eric Petit (Back-end; OS X)" );
info.AddDeveloper( "Bryan Varner (BeOS)" ); info.AddDeveloper( "Bryan Varner (BeOS)" );
wxAboutBox( info ); wxAboutBox( info );
#else
wxMessageBox(_T("Xmission " LONG_VERSION_STRING "\n"
"Copyright 2005-2007 The Transmission Project"),
_T("About Xmission"),
wxOK|wxICON_INFORMATION, this);
#endif
} }