summaryrefslogtreecommitdiff
path: root/RealtimeSync
diff options
context:
space:
mode:
Diffstat (limited to 'RealtimeSync')
-rw-r--r--RealtimeSync/RealtimeSync.cbp7
-rw-r--r--RealtimeSync/RealtimeSync.vcxproj18
-rw-r--r--RealtimeSync/main_dlg.cpp6
-rw-r--r--RealtimeSync/main_dlg.h4
-rw-r--r--RealtimeSync/makefile4
5 files changed, 21 insertions, 18 deletions
diff --git a/RealtimeSync/RealtimeSync.cbp b/RealtimeSync/RealtimeSync.cbp
index 1f6c8049..2b1b97b7 100644
--- a/RealtimeSync/RealtimeSync.cbp
+++ b/RealtimeSync/RealtimeSync.cbp
@@ -96,6 +96,7 @@
<Add library="libws2_32.a" />
<Add library="libwinspool.a" />
<Add library="libmpr.a" />
+ <Add library="libuxtheme.a" />
<Add directory="C:\Program Files\C++\Boost\stage\lib" />
</Linker>
<Unit filename="WxWizDialog.fbp" />
@@ -118,13 +119,15 @@
<Unit filename="xml_ffs.h" />
<Unit filename="xml_proc.cpp" />
<Unit filename="xml_proc.h" />
- <Unit filename="..\lib\dir_name.cpp" />
- <Unit filename="..\lib\folder_history_box.cpp" />
<Unit filename="..\lib\localization.cpp" />
<Unit filename="..\lib\process_xml.cpp" />
<Unit filename="..\lib\resolve_path.cpp" />
<Unit filename="..\lib\xml_base.cpp" />
<Unit filename="..\structures.cpp" />
+ <Unit filename="..\ui\dir_name.cpp" />
+ <Unit filename="..\ui\dir_name.h" />
+ <Unit filename="..\ui\folder_history_box.cpp" />
+ <Unit filename="..\ui\folder_history_box.h" />
<Unit filename="..\wx+\button.cpp" />
<Unit filename="..\wx+\format_unit.cpp" />
<Unit filename="..\wx+\mouse_move_dlg.cpp" />
diff --git a/RealtimeSync/RealtimeSync.vcxproj b/RealtimeSync/RealtimeSync.vcxproj
index 8c85de3b..46529d63 100644
--- a/RealtimeSync/RealtimeSync.vcxproj
+++ b/RealtimeSync/RealtimeSync.vcxproj
@@ -99,8 +99,8 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>ZEN_PLATFORM_WINDOWS;wxUSE_UNICODE;__WXMSW__;FFS_WIN;WXINTL_NO_GETTEXT_MACRO;__WXDEBUG__</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..;C:\Program Files\C++\wxWidgets\include;C:\Program Files\C++\wxWidgets\lib\vc_lib\mswud;C:\Program Files\C++\Boost</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WXUSINGDLL;ZEN_PLATFORM_WINDOWS;wxUSE_UNICODE;__WXMSW__;FFS_WIN;WXINTL_NO_GETTEXT_MACRO;__WXDEBUG__;</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..;C:\Program Files\C++\wxWidgets\include;C:\Program Files\C++\wxWidgets\lib\vc_dll\mswud;C:\Program Files\C++\Boost</AdditionalIncludeDirectories>
<PrecompiledHeaderFile>wx+/pch.h</PrecompiledHeaderFile>
<DisableSpecificWarnings>4100;4996;4267;4512</DisableSpecificWarnings>
<MultiProcessorCompilation>false</MultiProcessorCompilation>
@@ -115,7 +115,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalDependencies>wxmsw28ud_adv.lib;wxmsw28ud_core.lib;wxbase28ud.lib;wxpngd.lib;wxzlibd.lib;wxbase28ud_net.lib;comctl32.lib;ws2_32.lib;Rpcrt4.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>C:\Program Files\C++\wxWidgets\lib\vc_lib;C:\Program Files\C++\Boost\stage\lib</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>C:\Program Files\C++\wxWidgets\lib\vc_dll;C:\Program Files\C++\Boost\stage\lib</AdditionalLibraryDirectories>
<LinkStatus>
</LinkStatus>
</Link>
@@ -129,8 +129,8 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>ZEN_PLATFORM_WINDOWS;wxUSE_UNICODE;__WXMSW__;FFS_WIN;WXINTL_NO_GETTEXT_MACRO;__WXDEBUG__</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..;C:\Program Files\C++\wxWidgets-x64\include;C:\Program Files\C++\wxWidgets-x64\lib\vc_lib\mswud;C:\Program Files\C++\Boost</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WXUSINGDLL;ZEN_PLATFORM_WINDOWS;wxUSE_UNICODE;__WXMSW__;FFS_WIN;WXINTL_NO_GETTEXT_MACRO;__WXDEBUG__;</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..;C:\Program Files\C++\wxWidgets-x64\include;C:\Program Files\C++\wxWidgets-x64\lib\vc_dll\mswud;C:\Program Files\C++\Boost</AdditionalIncludeDirectories>
<PrecompiledHeaderFile>wx+/pch.h</PrecompiledHeaderFile>
<DisableSpecificWarnings>4100;4996;4267;4512</DisableSpecificWarnings>
<MultiProcessorCompilation>false</MultiProcessorCompilation>
@@ -146,7 +146,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalDependencies>wxmsw28ud_adv.lib;wxmsw28ud_core.lib;wxbase28ud.lib;wxpngd.lib;wxzlibd.lib;wxbase28ud_net.lib;comctl32.lib;ws2_32.lib;Rpcrt4.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>C:\Program Files\C++\wxWidgets-x64\lib\vc_lib;C:\Program Files\C++\Boost\stage64\lib</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>C:\Program Files\C++\wxWidgets-x64\lib\vc_dll;C:\Program Files\C++\Boost\stage64\lib</AdditionalLibraryDirectories>
<LinkStatus>
</LinkStatus>
</Link>
@@ -177,7 +177,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalDependencies>wxmsw28u_adv.lib;wxmsw28u_core.lib;wxbase28u.lib;wxpng.lib;wxzlib.lib;wxbase28u_net.lib;comctl32.lib;ws2_32.lib;winmm.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wxbase28u.lib;wxmsw28u_adv.lib;wxmsw28u_core.lib;wxpng.lib;wxzlib.lib;wxbase28u_net.lib;comctl32.lib;ws2_32.lib;winmm.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>C:\Program Files\C++\wxWidgets\lib\vc_lib;C:\Program Files\C++\Boost\stage\lib</AdditionalLibraryDirectories>
<LinkStatus>
@@ -227,13 +227,13 @@
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\lib\dir_name.cpp" />
- <ClCompile Include="..\lib\folder_history_box.cpp" />
<ClCompile Include="..\lib\localization.cpp" />
<ClCompile Include="..\lib\process_xml.cpp" />
<ClCompile Include="..\lib\resolve_path.cpp" />
<ClCompile Include="..\lib\xml_base.cpp" />
<ClCompile Include="..\structures.cpp" />
+ <ClCompile Include="..\ui\dir_name.cpp" />
+ <ClCompile Include="..\ui\folder_history_box.cpp" />
<ClCompile Include="..\wx+\button.cpp" />
<ClCompile Include="..\wx+\format_unit.cpp" />
<ClCompile Include="..\wx+\mouse_move_dlg.cpp" />
diff --git a/RealtimeSync/main_dlg.cpp b/RealtimeSync/main_dlg.cpp
index 30e5f04e..03b54374 100644
--- a/RealtimeSync/main_dlg.cpp
+++ b/RealtimeSync/main_dlg.cpp
@@ -160,7 +160,7 @@ void MainDialog::OnMenuAbout(wxCommandEvent& event)
wxString buildFormatted = _("(Build: %x)");
buildFormatted.Replace(wxT("%x"), build);
- wxMessageDialog* aboutDlg = new wxMessageDialog(this, wxString(wxT("RealtimeSync")) + wxT("\n\n") + buildFormatted, _("About"), wxOK);
+ wxMessageDialog* aboutDlg = new wxMessageDialog(this, wxString(L"RealtimeSync") + L"\n\n" + buildFormatted, _("About"), wxOK);
aboutDlg->ShowModal();
}
@@ -423,11 +423,11 @@ void MainDialog::addFolder(const std::vector<wxString>& newFolders, bool addFron
}
-void MainDialog::removeAddFolder(const int pos)
+void MainDialog::removeAddFolder(int pos)
{
wxWindowUpdateLocker dummy(this); //avoid display distortion
- if (0 <= pos && pos < int(dirNamesExtra.size()))
+ if (0 <= pos && pos < static_cast<int>(dirNamesExtra.size()))
{
//remove folder pairs from window
DirectoryPanel* dirToDelete = dirNamesExtra[pos];
diff --git a/RealtimeSync/main_dlg.h b/RealtimeSync/main_dlg.h
index 5c77fa8f..af3c93a9 100644
--- a/RealtimeSync/main_dlg.h
+++ b/RealtimeSync/main_dlg.h
@@ -10,7 +10,7 @@
#include "gui_generated.h"
#include <vector>
#include <memory>
-#include "../lib/dir_name.h"
+#include "../ui/dir_name.h"
#include <wx+/dir_picker.h>
namespace xmlAccess
@@ -64,7 +64,7 @@ private:
void addFolder(const wxString& dirname, bool addFront = false);
void addFolder(const std::vector<wxString>& newFolders, bool addFront = false);
- void removeAddFolder(const int pos); //keep it an int, allow negative values!
+ void removeAddFolder(int pos); //keep it an int, allow negative values!
void clearAddFolders();
static const wxString& lastConfigFileName();
diff --git a/RealtimeSync/makefile b/RealtimeSync/makefile
index a6552b41..956525f6 100644
--- a/RealtimeSync/makefile
+++ b/RealtimeSync/makefile
@@ -24,12 +24,12 @@ FILE_LIST+=tray_menu.cpp
FILE_LIST+=watcher.cpp
FILE_LIST+=xml_ffs.cpp
FILE_LIST+=xml_proc.cpp
-FILE_LIST+=../lib/dir_name.cpp
-FILE_LIST+=../lib/folder_history_box.cpp
+FILE_LIST+=../ui/dir_name.cpp
FILE_LIST+=../lib/localization.cpp
FILE_LIST+=../lib/process_xml.cpp
FILE_LIST+=../lib/resolve_path.cpp
FILE_LIST+=../lib/xml_base.cpp
+FILE_LIST+=../ui/folder_history_box.cpp
FILE_LIST+=../structures.cpp
FILE_LIST+=../wx+/button.cpp
FILE_LIST+=../wx+/format_unit.cpp
bgstack15