From d15383ce6ec367bc17d227b0ebd62ac1096175bd Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Fri, 5 Feb 2016 09:54:11 +0100
Subject: [PATCH] Work on wxAppEx continues...

---
 build/wxExtend.vcxproj         | 2 ++
 build/wxExtend.vcxproj.filters | 6 ++++++
 include/wxex/appbar.h          | 1 +
 include/wxex/appex.h           | 9 ++++++++-
 src/stdafx.h                   | 5 ++++-
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/build/wxExtend.vcxproj b/build/wxExtend.vcxproj
index 5427335..d6f4265 100644
--- a/build/wxExtend.vcxproj
+++ b/build/wxExtend.vcxproj
@@ -20,6 +20,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\appbar.cpp" />
+    <ClCompile Include="..\src\appex.cpp" />
     <ClCompile Include="..\src\stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@@ -29,6 +30,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\wxex\appbar.h" />
+    <ClInclude Include="..\include\wxex\appex.h" />
     <ClInclude Include="..\include\wxex\common.h" />
     <ClInclude Include="..\src\stdafx.h" />
   </ItemGroup>
diff --git a/build/wxExtend.vcxproj.filters b/build/wxExtend.vcxproj.filters
index ec75aac..7f2eee1 100644
--- a/build/wxExtend.vcxproj.filters
+++ b/build/wxExtend.vcxproj.filters
@@ -21,6 +21,9 @@
     <ClCompile Include="..\src\appbar.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\appex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\stdafx.h">
@@ -32,5 +35,8 @@
     <ClInclude Include="..\include\wxex\common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\wxex\appex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/include/wxex/appbar.h b/include/wxex/appbar.h
index 2f2cd0a..bae751f 100644
--- a/include/wxex/appbar.h
+++ b/include/wxex/appbar.h
@@ -24,6 +24,7 @@
 #include <ShlObj.h>
 
 #include <wx/frame.h>
+#include <wx/string.h>
 
 
 #define wxABT_AUTOHIDETIMERID       1
diff --git a/include/wxex/appex.h b/include/wxex/appex.h
index 1ec3765..7b08537 100644
--- a/include/wxex/appex.h
+++ b/include/wxex/appex.h
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <wx/app.h>
+#include <wx/intl.h>
 
 
 ///
@@ -28,8 +29,14 @@
 class wxAppEx : public wxApp
 {
 public:
+    ///
+    /// Called when application initializes.
+    ///
+    /// \returns
+    /// - true if initialization succeeded
+    /// - false otherwise
     virtual bool OnInit();
 
 protected:
-    wxLocale m_locale;
+    wxLocale m_locale; ///< Current locale
 };
diff --git a/src/stdafx.h b/src/stdafx.h
index d73f3b6..439ed65 100644
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -19,10 +19,13 @@
 
 #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/appex.h"
 
 #include "../include/wxex/common.h"
 
 #include <Windowsx.h>
-#include <wx/msgdlg.h>