mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-03 18:25:35 +00:00
Code Issues Releases Wiki Activity

(wx) get the wxWidgets port building again. :)

Browse source
This commit is contained in:
Charles Kerr 2008-09-19 17:17:34 +00:00
parent 9c2c4ca08d
commit e07bc3543e
4 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libtransmission/utils.h
View file

@ -31,6 +31,10 @@
#include <stdio.h> /* FILE* */
#include <time.h> /* time_t* */
#ifdef __cplusplus
extern "C" {
#endif
/***
****
***/
@ -280,4 +284,8 @@ tr_bitfield* tr_bitfieldOr( tr_bitfield*, const tr_bitfield* );
double tr_getRatio( double numerator, double denominator );
#ifdef __cplusplus
}
#endif
#endif

9
wx/Makefile.am
View file

@ -22,7 +22,12 @@ xmission_SOURCES = \
xmission_LDADD = \
$(top_builddir)/libtransmission/libtransmission.a \
$(top_builddir)/third-party/libevent/libevent.la \
$(top_builddir)/third-party/libevent/libevent_core.la \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
$(WX_LIBS) $(OPENSSL_LIBS) $(PTHREAD_LIBS) -lm
$(top_builddir)/third-party/shttpd/libshttpd.a \
$(WX_LIBS) \
$(OPENSSL_LIBS) \
$(LIBCURL_LIBS) \
$(PTHREAD_LIBS) -lm

2
wx/torrent-list.cc
View file

@ -18,8 +18,10 @@
* $Id$
*/
#include <algorithm>
#include <wx/intl.h>
#include <torrent-list.h>
#include <libtransmission/utils.h>
namespace
{

17
wx/xmission.cc
View file

@ -40,6 +40,7 @@
#include <wx/snglinst.h>
#include <wx/splitter.h>
#include <wx/statline.h>
#include <wx/stdpaths.h>
#include <wx/taskbar.h>
#include <wx/tglbtn.h>
#include <wx/toolbar.h>
@ -343,7 +344,7 @@ void
MyFrame :: OnRecheck( wxCommandEvent& WXUNUSED(unused) )
{
foreach( torrents_v, mySelectedTorrents, it )
tr_torrentRecheck( *it );
tr_torrentVerify( *it );
}
/**
@ -370,7 +371,7 @@ void MyFrame :: OnOpen( wxCommandEvent& WXUNUSED(event) )
const std::string filename = toStr( paths[i] );
tr_ctor * ctor = tr_ctorNew( handle );
tr_ctorSetMetainfoFromFile( ctor, filename.c_str() );
tr_ctorSetDestination( ctor, TR_FALLBACK, mySavePath.c_str() );
tr_ctorSetDownloadDir( ctor, TR_FALLBACK, mySavePath.c_str() );
tr_torrent * tor = tr_torrentNew( handle, ctor, NULL );
tr_ctorFree( ctor );
@ -389,7 +390,11 @@ void MyFrame :: OnOpen( wxCommandEvent& WXUNUSED(event) )
bool
MyApp :: OnInit( )
{
handle = tr_sessionInit( "wx" );
const wxString downloadDir = wxStandardPaths::Get().GetDocumentsDir( );
handle = tr_sessionInit( tr_getDefaultConfigDir(),
toStr(downloadDir).c_str(),
"wx" );
wxCmdLineParser cmdParser( cmdLineDesc, argc, argv );
if( cmdParser.Parse ( ) )
@ -516,7 +521,7 @@ MyFrame :: MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size
wxString key = _T("port");
if( !myConfig->Read( key, &port, TR_DEFAULT_PORT ) )
myConfig->Write( key, port );
tr_setBindPort( handle, port );
tr_sessionSetPeerPort( handle, port );
key = _T("save-path");
wxString wxstr;
@ -679,8 +684,8 @@ MyFrame :: MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size
int count = 0;
tr_ctor * ctor = tr_ctorNew( handle );
tr_ctorSetPaused( ctor, TR_FORCE, paused );
tr_ctorSetDestination( ctor, TR_FALLBACK, mySavePath.c_str() );
tr_torrent ** torrents = tr_loadTorrents ( handle, ctor, &count );
tr_ctorSetDownloadDir( ctor, TR_FALLBACK, mySavePath.c_str() );
tr_torrent ** torrents = tr_sessionLoadTorrents( handle, ctor, &count );
myTorrents.insert( myTorrents.end(), torrents, torrents+count );
tr_free( torrents );
tr_ctorFree( ctor );