Work on wxAppEx continues...

This commit is contained in:
Simon Rozman 2016-02-05 09:54:11 +01:00
parent 48767ae1b6
commit d15383ce6e
5 changed files with 21 additions and 2 deletions

View File

@ -20,6 +20,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\src\appbar.cpp" /> <ClCompile Include="..\src\appbar.cpp" />
<ClCompile Include="..\src\appex.cpp" />
<ClCompile Include="..\src\stdafx.cpp"> <ClCompile Include="..\src\stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@ -29,6 +30,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\include\wxex\appbar.h" /> <ClInclude Include="..\include\wxex\appbar.h" />
<ClInclude Include="..\include\wxex\appex.h" />
<ClInclude Include="..\include\wxex\common.h" /> <ClInclude Include="..\include\wxex\common.h" />
<ClInclude Include="..\src\stdafx.h" /> <ClInclude Include="..\src\stdafx.h" />
</ItemGroup> </ItemGroup>

View File

@ -21,6 +21,9 @@
<ClCompile Include="..\src\appbar.cpp"> <ClCompile Include="..\src\appbar.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\appex.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\src\stdafx.h"> <ClInclude Include="..\src\stdafx.h">
@ -32,5 +35,8 @@
<ClInclude Include="..\include\wxex\common.h"> <ClInclude Include="..\include\wxex\common.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\wxex\appex.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -24,6 +24,7 @@
#include <ShlObj.h> #include <ShlObj.h>
#include <wx/frame.h> #include <wx/frame.h>
#include <wx/string.h>
#define wxABT_AUTOHIDETIMERID 1 #define wxABT_AUTOHIDETIMERID 1

View File

@ -20,6 +20,7 @@
#pragma once #pragma once
#include <wx/app.h> #include <wx/app.h>
#include <wx/intl.h>
/// ///
@ -28,8 +29,14 @@
class wxAppEx : public wxApp class wxAppEx : public wxApp
{ {
public: public:
///
/// Called when application initializes.
///
/// \returns
/// - true if initialization succeeded
/// - false otherwise
virtual bool OnInit(); virtual bool OnInit();
protected: protected:
wxLocale m_locale; wxLocale m_locale; ///< Current locale
}; };

View File

@ -19,10 +19,13 @@
#pragma once #pragma once
// Since including <wx/app.h> introduces wrong include order in 3.0.2,
// include the grand <wx/wx.h> at a cost of longer pre-compilation phase.
#include <wx/wx.h>
#include "../include/wxex/appbar.h" #include "../include/wxex/appbar.h"
#include "../include/wxex/appex.h" #include "../include/wxex/appex.h"
#include "../include/wxex/common.h" #include "../include/wxex/common.h"
#include <Windowsx.h> #include <Windowsx.h>
#include <wx/msgdlg.h>