Menu
▾
▴
[ShareDaemon-CVS] ui-wx/src MainDlg.cpp,1.17,1.18 MessagesWnd.cpp,1.10,1.11 SearchWnd.cpp,1.15,1.16 SharedFilesWnd.cpp,1.10,1.11 wxInterface.wdr,1.8,1.9 wxInterface_wdr.cpp,1.8,1.9
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv27214
Modified Files:
MainDlg.cpp MessagesWnd.cpp SearchWnd.cpp SharedFilesWnd.cpp
wxInterface.wdr wxInterface_wdr.cpp
Log Message:
Unicode compatibility fix.
Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- MainDlg.cpp 27 Nov 2003 13:52:51 -0000 1.17
+++ MainDlg.cpp 30 Nov 2003 20:38:36 -0000 1.18
@@ -110,10 +110,15 @@
wxASSERT_MSG(statusbar, wxT("CMainDlg::CMainDlg() - StatusBar object not ready for accessing."));
GetBmpStatusConnection()->SetBitmap(img->GetImage(wxT("disconnected")));
+ GetBmpStatusConnection()->SetName(wxT("disconnected"));
GetBmpStatusUsers()->SetBitmap(img->GetImage(wxT("user")));
+ GetBmpStatusUsers()->SetName(wxT("user"));
GetBmpStatusFiles()->SetBitmap(img->GetImage(wxT("sharedfiles")));
+ GetBmpStatusFiles()->SetName(wxT("sharedfiles"));
GetBmpStatusUpload()->SetBitmap(img->GetImage(wxT("upload")));
+ GetBmpStatusUpload()->SetName(wxT("upload"));
GetBmpStatusDload()->SetBitmap(img->GetImage(wxT("download")));
+ GetBmpStatusDload()->SetName(wxT("download"));
/* Load dialog pages */
LoadAndShowDialogPages();
Index: MessagesWnd.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MessagesWnd.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- MessagesWnd.cpp 27 Nov 2003 08:23:11 -0000 1.10
+++ MessagesWnd.cpp 30 Nov 2003 20:38:36 -0000 1.11
@@ -41,7 +41,9 @@
/* Set images of dialog static bitmaps */
GetFriendImage()->SetBitmap(img->GetImage(wxT("friend")));
+ GetFriendImage()->SetName(wxT("friend"));
GetMessagesImage()->SetBitmap(img->GetImage(wxT("messages")));
+ GetMessagesImage()->SetName(wxT("messages"));
Hide();
}
Index: SearchWnd.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SearchWnd.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- SearchWnd.cpp 27 Nov 2003 08:23:11 -0000 1.15
+++ SearchWnd.cpp 30 Nov 2003 20:38:36 -0000 1.16
@@ -49,6 +49,7 @@
SearchWnd( this, TRUE );
GetSearchResultsImage()->SetBitmap(img->GetImage(wxT("searchresults")));
+ GetSearchResultsImage()->SetName(wxT("searchresults"));
Hide();
Index: SharedFilesWnd.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SharedFilesWnd.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- SharedFilesWnd.cpp 27 Nov 2003 08:23:12 -0000 1.10
+++ SharedFilesWnd.cpp 30 Nov 2003 20:38:36 -0000 1.11
@@ -40,6 +40,7 @@
SharedFilesWnd( this, TRUE );
GetSharedFilesImage()->SetBitmap(img->GetImage(wxT("sharedfiles")));
+ GetSharedFilesImage()->SetName(wxT("sharedfiles"));
Hide();
}
Index: wxInterface.wdr
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface.wdr,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
Binary files /tmp/cvs83vPDQ and /tmp/cvs29YaXw differ
Index: wxInterface_wdr.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface_wdr.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- wxInterface_wdr.cpp 27 Nov 2003 08:23:12 -0000 1.8
+++ wxInterface_wdr.cpp 30 Nov 2003 20:38:36 -0000 1.9
@@ -259,7 +259,6 @@
wxBoxSizer *item35 = new wxBoxSizer( wxHORIZONTAL );
wxStaticBitmap *item36 = new wxStaticBitmap( parent, ID_SEARCH_RESULTS_IMAGE, Icons( 0 ), wxDefaultPosition, wxDefaultSize );
- item36->SetName( "searchresults" );
item35->Add( item36, 0, wxALIGN_CENTER|wxALL, 5 );
wxStaticText *item37 = new wxStaticText( parent, ID_TEXT, _("Search Results"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -346,7 +345,6 @@
wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
wxStaticBitmap *item2 = new wxStaticBitmap( parent, ID_SHARED_FILES_IMAGE, Icons( 0 ), wxDefaultPosition, wxDefaultSize );
- item2->SetName( "sharedfiles" );
item1->Add( item2, 0, wxALIGN_CENTER|wxTOP|wxBOTTOM, 5 );
wxStaticText *item3 = new wxStaticText( parent, ID_TXT_SHARED, _("Shared Files"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -475,7 +473,6 @@
wxBoxSizer *item2 = new wxBoxSizer( wxHORIZONTAL );
wxStaticBitmap *item3 = new wxStaticBitmap( parent, ID_FRIEND_IMAGE, Icons( 0 ), wxDefaultPosition, wxDefaultSize );
- item3->SetName( "friend" );
item2->Add( item3, 0, wxALIGN_CENTER|wxALL, 5 );
wxStaticText *item4 = new wxStaticText( parent, ID_TEXT, _("Friends"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -495,7 +492,6 @@
wxBoxSizer *item7 = new wxBoxSizer( wxHORIZONTAL );
wxStaticBitmap *item8 = new wxStaticBitmap( parent, ID_MESSAGES_IMAGE, Icons( 0 ), wxDefaultPosition, wxDefaultSize );
- item8->SetName( "messages" );
item7->Add( item8, 0, wxALIGN_CENTER|wxALL, 5 );
wxStaticText *item9 = new wxStaticText( parent, ID_TEXT, _("Messages"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -879,7 +875,6 @@
item2->Add( item4, 0, wxALIGN_CENTER, 5 );
wxStaticBitmap *item5 = new wxStaticBitmap( parent, ID_BMP_STATUS_USERS, Icons( 0 ), wxDefaultPosition, wxDefaultSize );
- item5->SetName( "user" );
item2->Add( item5, 0, wxALIGN_CENTER|wxLEFT, 5 );
wxStaticText *item6 = new wxStaticText( parent, ID_STATUS_USERS, wxT("0(0)"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -889,7 +884,6 @@
item2->Add( item7, 0, wxALIGN_CENTER, 5 );
wxStaticBitmap *item8 = new wxStaticBitmap( parent, ID_BMP_STATUS_FILES, Icons( 0 ), wxDefaultPosition, wxDefaultSize );
- item8->SetName( "sharedfiles" );
item2->Add( item8, 0, wxALIGN_CENTER|wxLEFT, 5 );
wxStaticText *item9 = new wxStaticText( parent, ID_STATUS_FILES, wxT("0(0)"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -899,7 +893,6 @@
item2->Add( item10, 0, wxALIGN_CENTER, 5 );
wxStaticBitmap *item11 = new wxStaticBitmap( parent, ID_BMP_STATUS_UPLOAD, Icons( 0 ), wxDefaultPosition, wxDefaultSize );
- item11->SetName( "upload" );
item2->Add( item11, 0, wxALIGN_CENTER|wxLEFT, 5 );
wxStaticText *item12 = new wxStaticText( parent, ID_STATUS_UPLOAD, wxT("0 kb/s"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -909,7 +902,6 @@
item2->Add( item13, 0, wxALIGN_CENTER, 5 );
wxStaticBitmap *item14 = new wxStaticBitmap( parent, ID_BMP_STATUS_DLOAD, Icons( 0 ), wxDefaultPosition, wxDefaultSize );
- item14->SetName( "download" );
item2->Add( item14, 0, wxALIGN_CENTER|wxLEFT, 5 );
wxStaticText *item15 = new wxStaticText( parent, ID_STATUS_DLOAD, _("0 kb/s"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -919,7 +911,6 @@
item2->Add( item16, 0, wxALIGN_CENTER, 5 );
wxStaticBitmap *item17 = new wxStaticBitmap( parent, ID_BMP_STATUS_CONNECTION, Icons( 0 ), wxDefaultPosition, wxDefaultSize );
- item17->SetName( "disconnected" );
item2->Add( item17, 0, wxALIGN_CENTER|wxLEFT, 5 );
wxStaticText *item18 = new wxStaticText( parent, ID_STATUS_CONNECTION, _("Disconnected"), wxDefaultPosition, wxDefaultSize, 0 );
|
