Refactor, updated docs

LazyPanda07 · Jul 17, 2021 · 0b260ba · 0b260ba
1 parent e99e98f
commit 0b260ba
Show file tree

Hide file tree

Showing 1,070 changed files with 6,669 additions and 5,466 deletions.
diff --git a/Doxyfile b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = GUIFramework
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.6-beta
+PROJECT_NUMBER         = 0.6.1-beta
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/GUIFramework/GUIFramework.vcxproj b/GUIFramework/GUIFramework.vcxproj
@@ -125,7 +125,7 @@
     <ClInclude Include="src\Exceptions\NotImplemented.h" />
     <ClInclude Include="src\GUIFrameworkConstants.h" />
     <ClInclude Include="src\Exceptions\BaseGUIFrameworkException.h" />
-    <ClInclude Include="src\Exceptions\CantFindSeparateWindowFunctionException.h" />
+    <ClInclude Include="src\Exceptions\CantFindCompositeFunctionException.h" />
     <ClInclude Include="src\Exceptions\SelectListException.h" />
     <ClInclude Include="src\Exceptions\ExceptionConstants.h" />
     <ClInclude Include="src\Exceptions\GetLastErrorException.h" />
@@ -278,7 +278,7 @@
     <ClCompile Include="src\Composites\DialogBox.cpp" />
     <ClCompile Include="src\Composites\SeparateWindow.cpp" />
     <ClCompile Include="src\Exceptions\BaseGUIFrameworkException.cpp" />
-    <ClCompile Include="src\Exceptions\CantFindSeparateWindowFunctionException.cpp" />
+    <ClCompile Include="src\Exceptions\CantFindCompositeFunctionException.cpp" />
     <ClCompile Include="src\Exceptions\FileDoesNotExist.cpp" />
     <ClCompile Include="src\Exceptions\NotImplemented.cpp" />
     <ClCompile Include="src\Exceptions\SelectListException.cpp" />

diff --git a/GUIFramework/GUIFramework.vcxproj.filters b/GUIFramework/GUIFramework.vcxproj.filters
@@ -30,7 +30,7 @@
     <ClInclude Include="src\GUIFrameworkConstants.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
-    <ClInclude Include="src\Exceptions\CantFindSeparateWindowFunctionException.h">
+    <ClInclude Include="src\Exceptions\CantFindCompositeFunctionException.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
     <ClInclude Include="src\BaseComponents\BaseComponent.h">
@@ -494,7 +494,7 @@
     <ClCompile Include="src\Exceptions\BaseGUIFrameworkException.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
-    <ClCompile Include="src\Exceptions\CantFindSeparateWindowFunctionException.cpp">
+    <ClCompile Include="src\Exceptions\CantFindCompositeFunctionException.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
     <ClCompile Include="src\BaseComponents\BaseComponent.cpp">

diff --git a/GUIFramework/src/BaseComponents/BaseComponent.cpp b/GUIFramework/src/BaseComponents/BaseComponent.cpp
@@ -2,7 +2,7 @@
 #include "BaseComponent.h"
 
 #include "BaseComposites/BaseComposite.h"
-#include "Exceptions/CantFindSeparateWindowFunctionException.h"
+#include "Exceptions/CantFindCompositeFunctionException.h"
 #include "Exceptions/FileDoesNotExist.h"
 #include "Interfaces/Components/IResizableComponent.h"
 
@@ -71,7 +71,7 @@ namespace gui_framework
 
 				if (!windowFunction)
 				{
-					throw exceptions::CantFindSeparateWindowFunctionException(windowFunctionName + "WindowFunction");
+					throw exceptions::CantFindCompositeFunctionException(windowFunctionName + "WindowFunction");
 				}
 
 				classStruct.cbSize = sizeof(WNDCLASSEXW);
@@ -88,14 +88,14 @@ namespace gui_framework
 		handle = CreateWindowExW
 		(
 			static_cast<DWORD>(styles.getExtendedStyles()),
-			className.data(),
+			classStruct.lpszClassName,
 			windowName.data(),
 			static_cast<DWORD>(styles.getStyles()) | (parent ? WS_CHILDWINDOW | WS_BORDER : WS_OVERLAPPEDWINDOW),
 			settings.x,
 			settings.y,
 			settings.width,
 			settings.height,
-			parent ? parent->handle : nullptr,
+			parent ? parent->getHandle() : nullptr,
 			reinterpret_cast<HMENU>(id),
 			module,
 			nullptr

diff --git a/GUIFramework/src/BaseComponents/BaseComponent.h b/GUIFramework/src/BaseComponents/BaseComponent.h
@@ -130,6 +130,8 @@ namespace gui_framework
 
 		virtual std::vector<const Menu*> getPopupMenus() const final;
 
+		/// @brief 
+		/// @return Components returns id, composites returns 0 
 		virtual uint32_t getId() const final;
 
 		virtual COLORREF getBackgroundColor() const final;

diff --git a/GUIFramework/src/Exceptions/CantFindCompositeFunctionException.cpp b/GUIFramework/src/Exceptions/CantFindCompositeFunctionException.cpp
@@ -0,0 +1,16 @@
+#include "pch.h"
+#include "CantFindCompositeFunctionException.h"
+
+using namespace std;
+
+namespace gui_framework
+{
+	namespace exceptions
+	{
+		CantFindCompositeFunctionException::CantFindCompositeFunctionException(const string& functionName) :
+			BaseGUIFrameworkException(format("Cant find 'CREATE_DEFAULT_WINDOW_FUNCTION({})' macro", functionName))
+		{
+
+		}
+	}
+}
diff --git a/GUIFramework/src/Exceptions/CantFindCompositeFunctionException.h b/GUIFramework/src/Exceptions/CantFindCompositeFunctionException.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "pch.h"
+#include "BaseGUIFrameworkException.h"
+
+namespace gui_framework
+{
+	namespace exceptions
+	{
+		/// @brief Can't find CREATE_DEFAULT_WINDOW_FUNCTION macro for specific window
+		class GUI_FRAMEWORK_API CantFindCompositeFunctionException : public BaseGUIFrameworkException
+		{
+		public:
+			CantFindCompositeFunctionException(const std::string& functionName);
+
+			~CantFindCompositeFunctionException() = default;
+		};
+	}
+}
diff --git a/GUIFramework/src/Exceptions/CantFindSeparateWindowFunctionException.cpp b/GUIFramework/src/Exceptions/CantFindSeparateWindowFunctionException.cpp
diff --git a/GUIFramework/src/Exceptions/CantFindSeparateWindowFunctionException.h b/GUIFramework/src/Exceptions/CantFindSeparateWindowFunctionException.h
diff --git a/docs/_additional_creation_data_8h.html b/docs/_additional_creation_data_8h.html
@@ -26,7 +26,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">GUIFramework
-   &#160;<span id="projectnumber">0.6-beta</span>
+   &#160;<span id="projectnumber">0.6.1-beta</span>
    </div>
    <div id="projectbrief">Framework for desktop GUI applications in C++.</div>
   </td>

diff --git a/docs/_additional_creation_data_8h_source.html b/docs/_additional_creation_data_8h_source.html
@@ -26,7 +26,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">GUIFramework
-   &#160;<span id="projectnumber">0.6-beta</span>
+   &#160;<span id="projectnumber">0.6.1-beta</span>
    </div>
    <div id="projectbrief">Framework for desktop GUI applications in C++.</div>
   </td>
@@ -115,7 +115,7 @@
 <div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;    }</div>
 <div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;}</div>
 <div class="ttc" id="a_base_component_8h_html"><div class="ttname"><a href="_base_component_8h.html">BaseComponent.h</a></div></div>
-<div class="ttc" id="a_g_u_i_framework_constants_8h_html_a15da9ebdfa896557bb941a5da31021ba"><div class="ttname"><a href="_g_u_i_framework_constants_8h.html#a15da9ebdfa896557bb941a5da31021ba">GUI_FRAMEWORK_API</a></div><div class="ttdeci">#define GUI_FRAMEWORK_API</div><div class="ttdef"><b>Definition:</b> <a href="_g_u_i_framework_constants_8h_source.html#l00094">GUIFrameworkConstants.h:94</a></div></div>
+<div class="ttc" id="a_g_u_i_framework_constants_8h_html_a15da9ebdfa896557bb941a5da31021ba"><div class="ttname"><a href="_g_u_i_framework_constants_8h.html#a15da9ebdfa896557bb941a5da31021ba">GUI_FRAMEWORK_API</a></div><div class="ttdeci">#define GUI_FRAMEWORK_API</div><div class="ttdef"><b>Definition:</b> <a href="_g_u_i_framework_constants_8h_source.html#l00095">GUIFrameworkConstants.h:95</a></div></div>
 <div class="ttc" id="aclassgui__framework_1_1utility_1_1_additional_creation_data_html"><div class="ttname"><a href="classgui__framework_1_1utility_1_1_additional_creation_data.html">gui_framework::utility::AdditionalCreationData</a></div><div class="ttdoc">Base templated class for component creators.</div><div class="ttdef"><b>Definition:</b> <a href="_additional_creation_data_8h_source.html#l00012">AdditionalCreationData.h:13</a></div></div>
 <div class="ttc" id="aclassgui__framework_1_1utility_1_1_additional_creation_data_html_a21e872b6f833b8c17285e8dbd806412c"><div class="ttname"><a href="classgui__framework_1_1utility_1_1_additional_creation_data.html#a21e872b6f833b8c17285e8dbd806412c">gui_framework::utility::AdditionalCreationData::getData</a></div><div class="ttdeci">virtual std::any getData() const</div><div class="ttdef"><b>Definition:</b> <a href="_additional_creation_data_8h_source.html#l00023">AdditionalCreationData.h:23</a></div></div>
 <div class="ttc" id="aclassgui__framework_1_1utility_1_1_additional_creation_data_html_a481e121737a066e43a5a4c79a32e5151"><div class="ttname"><a href="classgui__framework_1_1utility_1_1_additional_creation_data.html#a481e121737a066e43a5a4c79a32e5151">gui_framework::utility::AdditionalCreationData::~AdditionalCreationData</a></div><div class="ttdeci">virtual ~AdditionalCreationData()=default</div></div>

diff --git a/docs/_base_button_8cpp.html b/docs/_base_button_8cpp.html
@@ -26,7 +26,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">GUIFramework
-   &#160;<span id="projectnumber">0.6-beta</span>
+   &#160;<span id="projectnumber">0.6.1-beta</span>
    </div>
    <div id="projectbrief">Framework for desktop GUI applications in C++.</div>
   </td>

diff --git a/docs/_base_button_8cpp_source.html b/docs/_base_button_8cpp_source.html
@@ -26,7 +26,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">GUIFramework
-   &#160;<span id="projectnumber">0.6-beta</span>
+   &#160;<span id="projectnumber">0.6.1-beta</span>
    </div>
    <div id="projectbrief">Framework for desktop GUI applications in C++.</div>
   </td>
@@ -151,13 +151,13 @@
 <div class="ttc" id="a_not_implemented_8h_html"><div class="ttname"><a href="_not_implemented_8h.html">NotImplemented.h</a></div></div>
 <div class="ttc" id="aclassgui__framework_1_1_base_button_html_a5e7389d4dde1fcc3481f37bd78d55923"><div class="ttname"><a href="classgui__framework_1_1_base_button.html#a5e7389d4dde1fcc3481f37bd78d55923">gui_framework::BaseButton::getOnClick</a></div><div class="ttdeci">virtual const std::function&lt; void()&gt; &amp; getOnClick() const final</div><div class="ttdef"><b>Definition:</b> <a href="_base_button_8cpp_source.html#l00050">BaseButton.cpp:50</a></div></div>
 <div class="ttc" id="aclassgui__framework_1_1_base_button_html_aafe12f92e9407defc8e3211518f52025"><div class="ttname"><a href="classgui__framework_1_1_base_button.html#aafe12f92e9407defc8e3211518f52025">gui_framework::BaseButton::setTextColor</a></div><div class="ttdeci">virtual void setTextColor(uint8_t red, uint8_t green, uint8_t blue) final override</div><div class="ttdoc">Not implemented.</div><div class="ttdef"><b>Definition:</b> <a href="_base_button_8cpp_source.html#l00055">BaseButton.cpp:55</a></div></div>
-<div class="ttc" id="aclassgui__framework_1_1_base_button_html_ac98949457fb92497faad41a086576583"><div class="ttname"><a href="classgui__framework_1_1_base_button.html#ac98949457fb92497faad41a086576583">gui_framework::BaseButton::onClick</a></div><div class="ttdeci">std::function&lt; void()&gt; onClick</div><div class="ttdef"><b>Definition:</b> <a href="_base_button_8h_source.html#l00015">BaseButton.h:15</a></div></div>
+<div class="ttc" id="aclassgui__framework_1_1_base_button_html_ac98949457fb92497faad41a086576583"><div class="ttname"><a href="classgui__framework_1_1_base_button.html#ac98949457fb92497faad41a086576583">gui_framework::BaseButton::onClick</a></div><div class="ttdeci">std::function&lt; void()&gt; onClick</div><div class="ttdef"><b>Definition:</b> <a href="_base_button_8h_source.html#l00016">BaseButton.h:16</a></div></div>
 <div class="ttc" id="aclassgui__framework_1_1_base_button_html_ad176fd01f8de165e253b7a92680c3505"><div class="ttname"><a href="classgui__framework_1_1_base_button.html#ad176fd01f8de165e253b7a92680c3505">gui_framework::BaseButton::setOnClick</a></div><div class="ttdeci">virtual void setOnClick(const std::function&lt; void()&gt; &amp;onClick) final</div><div class="ttdef"><b>Definition:</b> <a href="_base_button_8cpp_source.html#l00045">BaseButton.cpp:45</a></div></div>
 <div class="ttc" id="aclassgui__framework_1_1_base_component_html"><div class="ttname"><a href="classgui__framework_1_1_base_component.html">gui_framework::BaseComponent</a></div><div class="ttdoc">Base class for all windows, controls, etc.</div><div class="ttdef"><b>Definition:</b> <a href="_base_component_8h_source.html#l00010">BaseComponent.h:11</a></div></div>
-<div class="ttc" id="aclassgui__framework_1_1exceptions_1_1_not_implemented_html"><div class="ttname"><a href="classgui__framework_1_1exceptions_1_1_not_implemented.html">gui_framework::exceptions::NotImplemented</a></div><div class="ttdoc">Throws by not implemented methods.</div><div class="ttdef"><b>Definition:</b> <a href="_not_implemented_8h_source.html#l00010">NotImplemented.h:11</a></div></div>
+<div class="ttc" id="aclassgui__framework_1_1exceptions_1_1_not_implemented_html"><div class="ttname"><a href="classgui__framework_1_1exceptions_1_1_not_implemented.html">gui_framework::exceptions::NotImplemented</a></div><div class="ttdoc">Throws by not implemented methods.</div><div class="ttdef"><b>Definition:</b> <a href="_not_implemented_8h_source.html#l00011">NotImplemented.h:12</a></div></div>
 <div class="ttc" id="aclassgui__framework_1_1interfaces_1_1_i_text_operations_html_a6236a648c9d82e9f658127d6e872839d"><div class="ttname"><a href="classgui__framework_1_1interfaces_1_1_i_text_operations.html#a6236a648c9d82e9f658127d6e872839d">gui_framework::interfaces::ITextOperations::setText</a></div><div class="ttdeci">virtual void setText(const std::wstring &amp;text) const final</div><div class="ttdef"><b>Definition:</b> <a href="_i_text_operations_8cpp_source.html#l00018">ITextOperations.cpp:18</a></div></div>
-<div class="ttc" id="aclassgui__framework_1_1styles_1_1_button_styles_html"><div class="ttname"><a href="classgui__framework_1_1styles_1_1_button_styles.html">gui_framework::styles::ButtonStyles</a></div><div class="ttdoc">Base class for button styles.</div><div class="ttdef"><b>Definition:</b> <a href="_button_styles_8h_source.html#l00010">ButtonStyles.h:11</a></div></div>
-<div class="ttc" id="anamespacegui__framework_1_1standard__classes_html_a3a70e6e92deddb65c6406def06e23ec8"><div class="ttname"><a href="namespacegui__framework_1_1standard__classes.html#a3a70e6e92deddb65c6406def06e23ec8">gui_framework::standard_classes::button</a></div><div class="ttdeci">constexpr std::wstring_view button</div><div class="ttdef"><b>Definition:</b> <a href="_g_u_i_framework_constants_8h_source.html#l00012">GUIFrameworkConstants.h:12</a></div></div>
+<div class="ttc" id="aclassgui__framework_1_1styles_1_1_button_styles_html"><div class="ttname"><a href="classgui__framework_1_1styles_1_1_button_styles.html">gui_framework::styles::ButtonStyles</a></div><div class="ttdoc">Base class for button styles.</div><div class="ttdef"><b>Definition:</b> <a href="_button_styles_8h_source.html#l00011">ButtonStyles.h:12</a></div></div>
+<div class="ttc" id="anamespacegui__framework_1_1standard__classes_html_a3a70e6e92deddb65c6406def06e23ec8"><div class="ttname"><a href="namespacegui__framework_1_1standard__classes.html#a3a70e6e92deddb65c6406def06e23ec8">gui_framework::standard_classes::button</a></div><div class="ttdeci">constexpr std::wstring_view button</div><div class="ttdef"><b>Definition:</b> <a href="_g_u_i_framework_constants_8h_source.html#l00013">GUIFrameworkConstants.h:13</a></div></div>
 <div class="ttc" id="anamespacegui__framework_html"><div class="ttname"><a href="namespacegui__framework.html">gui_framework</a></div><div class="ttdef"><b>Definition:</b> <a href="_base_component_8cpp_source.html#l00014">BaseComponent.cpp:15</a></div></div>
 <div class="ttc" id="apch_8h_html"><div class="ttname"><a href="pch_8h.html">pch.h</a></div></div>
 <div class="ttc" id="astructgui__framework_1_1utility_1_1_component_settings_html"><div class="ttname"><a href="structgui__framework_1_1utility_1_1_component_settings.html">gui_framework::utility::ComponentSettings</a></div><div class="ttdoc">All settings for windows.</div><div class="ttdef"><b>Definition:</b> <a href="_component_settings_8h_source.html#l00010">ComponentSettings.h:11</a></div></div>

diff --git a/docs/_base_button_8h.html b/docs/_base_button_8h.html
@@ -26,7 +26,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">GUIFramework
-   &#160;<span id="projectnumber">0.6-beta</span>
+   &#160;<span id="projectnumber">0.6.1-beta</span>
    </div>
    <div id="projectbrief">Framework for desktop GUI applications in C++.</div>
   </td>
@@ -90,7 +90,8 @@
 <div class="title">BaseButton.h File Reference</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="textblock"><code>#include &quot;<a class="el" href="_base_component_8h_source.html">BaseComponents/BaseComponent.h</a>&quot;</code><br />
+<div class="textblock"><code>#include &quot;<a class="el" href="pch_8h_source.html">pch.h</a>&quot;</code><br />
+<code>#include &quot;<a class="el" href="_base_component_8h_source.html">BaseComponents/BaseComponent.h</a>&quot;</code><br />
 <code>#include &quot;<a class="el" href="_i_text_operations_8h_source.html">Interfaces/Components/ITextOperations.h</a>&quot;</code><br />
 <code>#include &quot;<a class="el" href="_button_styles_8h_source.html">Styles/Components/Buttons/ButtonStyles.h</a>&quot;</code><br />
 </div>