коммит

e60d9939 · Byurrrer · 166dfb12 · e60d9939 · e60d9939 · e60d9939
Commit e60d9939 authored Oct 05, 2017 by Byurrrer
9 changed files
--- a/proj/sxcore/vs2013/sxcore.vcxproj
+++ b/proj/sxcore/vs2013/sxcore.vcxproj
@@ -13,17 +13,17 @@
  <ItemGroup>
    <ClCompile Include="..\..\..\source\core\concmd.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\core\Config.cpp" />
    <ClCompile Include="..\..\..\source\core\cvars.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\core\file.cpp" />
    <ClCompile Include="..\..\..\source\core\sxcore.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\core\sxcore_dll.cpp" />
    <ClCompile Include="..\..\..\source\core\Task.cpp" />
@@ -114,7 +114,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SXCORE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SXCORE_EXPORTS;SX_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    </ClCompile>
    <Link>

--- a/proj/sxguiwinapi/vs2013/sxguiwinapi.vcxproj
+++ b/proj/sxguiwinapi/vs2013/sxguiwinapi.vcxproj
@@ -11,88 +11,88 @@
    </ProjectConfiguration>
  </ItemGroup>
  <ItemGroup>
+    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI.cpp" />
    <ClCompile Include="..\..\..\source\SXGUIWinApi\sxguiwinapi_dll.cpp" />
    <ClCompile Include="..\..\..\source\SXGUIWinApi\sxgui_base.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_base_wnd.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_button.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_check_box.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_combo_box.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_edit.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_group_box.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_hint.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\SXGUIWinApi\sxgui_img_button.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_list_box.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_list_view.cpp" />
    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_memo.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\SXGUIWinApi\sxgui_menu.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_progress_bar.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_radio_button.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_static.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_status_bar.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_toolbar.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_track_bar.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_up_down.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\..\source\SXGUIWinApi\SXGUI.h" />
-    <ClInclude Include="..\..\..\source\SXGUIWinApi\sxguielements.h" />
-    <ClInclude Include="..\..\..\source\SXGUIWinApi\SXGUIH.h" />
    <ClInclude Include="..\..\..\source\SXGUIWinApi\sxgui_base.h" />
    <ClInclude Include="..\..\..\source\SXGUIWinApi\SXGUI_base_wnd.h" />
    <ClInclude Include="..\..\..\source\SXGUIWinApi\sxgui_button.h" />
@@ -103,6 +103,7 @@
    <ClInclude Include="..\..\..\source\SXGUIWinApi\SXGUI_hint.h" />
    <ClInclude Include="..\..\..\source\SXGUIWinApi\SXGUI_img_button.h" />
    <ClInclude Include="..\..\..\source\SXGUIWinApi\SXGUI_list_box.h" />
+    <ClInclude Include="..\..\..\source\SXGUIWinApi\SXGUI_list_view.h" />
    <ClInclude Include="..\..\..\source\SXGUIWinApi\SXGUI_memo.h" />
    <ClInclude Include="..\..\..\source\SXGUIWinApi\SXGUI_menu.h" />
    <ClInclude Include="..\..\..\source\SXGUIWinApi\SXGUI_progress_bar.h" />
@@ -184,7 +185,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SXGUIWINAPI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SXGUIWINAPI_EXPORTS;SX_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    </ClCompile>
    <Link>

--- a/proj/sxguiwinapi/vs2013/sxguiwinapi.vcxproj.filters
+++ b/proj/sxguiwinapi/vs2013/sxguiwinapi.vcxproj.filters
@@ -75,6 +75,12 @@
    <ClCompile Include="..\..\..\source\SXGUIWinApi\sxgui_base.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_list_view.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\..\source\SXGUIWinApi\sxgui_button.h">
@@ -131,12 +137,6 @@
    <ClInclude Include="..\..\..\source\SXGUIWinApi\SXGUI_up_down.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\..\source\SXGUIWinApi\sxguielements.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\SXGUIWinApi\SXGUIH.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\..\source\SXGUIWinApi\SXGUI.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -146,5 +146,8 @@
    <ClInclude Include="..\..\..\source\SXGUIWinApi\SXGUI_base_wnd.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\source\SXGUIWinApi\SXGUI_list_view.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
 </Project>
\ No newline at end of file
--- a/source/SXGUIWinApi/SXGUI.cpp
+++ b/source/SXGUIWinApi/SXGUI.cpp
@@ -5,26 +5,26 @@ See the license in LICENSE
 ******************************************************/

 #include <SXGUIWinApi\SXGUI.h>
-#include <SXGUIWinApi\SXGUI_base.cpp>
-#include <SXGUIWinApi\SXGUI_base_wnd.cpp>
-#include <SXGUIWinApi\SXGUI_static.cpp>
-#include <SXGUIWinApi\SXGUI_button.cpp>
-#include <SXGUIWinApi\SXGUI_img_button.cpp>
-#include <SXGUIWinApi\SXGUI_edit.cpp>
-#include <SXGUIWinApi\SXGUI_up_down.cpp>
-#include <SXGUIWinApi\SXGUI_memo.cpp>
-#include <SXGUIWinApi\SXGUI_combo_box.cpp>
-#include <SXGUIWinApi\SXGUI_list_box.cpp>
-#include <SXGUIWinApi\SXGUI_list_view.cpp>
-#include <SXGUIWinApi\SXGUI_group_box.cpp>
-#include <SXGUIWinApi\SXGUI_progress_bar.cpp>
-#include <SXGUIWinApi\SXGUI_radio_button.cpp>
-#include <SXGUIWinApi\SXGUI_check_box.cpp>
-#include <SXGUIWinApi\SXGUI_track_bar.cpp>
-#include <SXGUIWinApi\SXGUI_status_bar.cpp>
-#include <SXGUIWinApi\SXGUI_hint.cpp>
-#include <SXGUIWinApi\SXGUI_menu.cpp>
-#include <SXGUIWinApi\SXGUI_toolbar.cpp>
+#include <SXGUIWinApi\SXGUI_base.h>
+#include <SXGUIWinApi\SXGUI_base_wnd.h>
+#include <SXGUIWinApi\SXGUI_static.h>
+#include <SXGUIWinApi\SXGUI_button.h>
+#include <SXGUIWinApi\SXGUI_img_button.h>
+#include <SXGUIWinApi\SXGUI_edit.h>
+#include <SXGUIWinApi\SXGUI_up_down.h>
+#include <SXGUIWinApi\SXGUI_memo.h>
+#include <SXGUIWinApi\SXGUI_combo_box.h>
+#include <SXGUIWinApi\SXGUI_list_box.h>
+#include <SXGUIWinApi\SXGUI_list_view.h>
+#include <SXGUIWinApi\SXGUI_group_box.h>
+#include <SXGUIWinApi\SXGUI_progress_bar.h>
+#include <SXGUIWinApi\SXGUI_radio_button.h>
+#include <SXGUIWinApi\SXGUI_check_box.h>
+#include <SXGUIWinApi\SXGUI_track_bar.h>
+#include <SXGUIWinApi\SXGUI_status_bar.h>
+#include <SXGUIWinApi\SXGUI_hint.h>
+#include <SXGUIWinApi\SXGUI_menu.h>
+#include <SXGUIWinApi\SXGUI_toolbar.h>

 ISXGUIBaseWnd* SXGUICrBaseWnd(
 	const char* class_name, const char* caption, const char* menu,

--- a/source/SXGUIWinApi/SXGUI.h
+++ b/source/SXGUIWinApi/SXGUI.h
@@ -731,7 +731,7 @@ struct ISXGUIListView : public virtual ISXGUIComponent
 };

 //! создает экземплляр объекта "istView", и возвращает указатель
-SX_LIB_API ISXGUIListView* SXGUICrListViewEx(const char* caption, WORD x, WORD y, WORD width, WORD heigth, DWORD exstyle, DWORD style, HWND parent, WNDPROC handler, DWORD id);
+SX_LIB_API ISXGUIListView* SXGUICrListViewEx,(const char* caption, WORD x, WORD y, WORD width, WORD heigth, DWORD exstyle, DWORD style, HWND parent, WNDPROC handler, DWORD id);

 //! создает экземплляр объекта "istView", и возвращает указатель
 SX_LIB_API ISXGUIListView* SXGUICrListView(const char* caption, WORD x, WORD y, WORD width, WORD heigth, HWND parent, WNDPROC handler, DWORD id);

--- a/source/SXGUIWinApi/SXGUI_list_box.cpp
+++ b/source/SXGUIWinApi/SXGUI_list_box.cpp
@@ -80,9 +80,7 @@ int SXGUIListBox::GetCountItem()

 bool SXGUIListBox::SetSel(int index)
 {
-	if (!SendMessage(this->GetHWND(), LB_SETCURSEL, WPARAM(index), 0))
-		return false;
-	return true;
+	return SendMessage(this->GetHWND(), LB_SETCURSEL, (WPARAM)index, 0);
 }

 int SXGUIListBox::GetSel()

--- a/source/SXGUIWinApi/SXGUI_list_view.cpp
+++ b/source/SXGUIWinApi/SXGUI_list_view.cpp

-#include <SXGUIWinApi\SXGUI_list_view.h>
-
-#pragma once
+#include "SXGUI_list_view.h"

 SXGUIListView::SXGUIListView()
 {

--- a/source/SXGUIWinApi/SXGUI_list_view.h
+++ b/source/SXGUIWinApi/SXGUI_list_view.h
@@ -2,9 +2,7 @@
 #ifndef SXGUI_LIST_VIEW_H
 #define SXGUI_LIST_VIEW_H

-#include <SXGUIWinApi\SXGUI_base.h>
-
-#pragma once
+#include "SXGUI_base.h"

 class SXGUIListView : public SXGUIComponent, public virtual ISXGUIListView
 {

--- a/common @ 71806c75
+++ b/common @ 71806c75
+Subproject commit 71806c756cf54442ef5b6ec17688aa8680c198d0