Fix GacUI_Controls (except AddressBook and ColorPicker) (NOT READY)

This commit is contained in:
Zihan Chen
2017-08-26 02:02:55 -07:00
parent 764f38499f
commit b3a7fcf65e
58 changed files with 2542 additions and 2084 deletions
+8 -7
View File
@@ -7,11 +7,6 @@ using namespace vl::stream;
#pragma comment(linker,"\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int CmdShow)
{
return SetupWindowsDirect2DRenderer();
}
void GuiMain()
{
{
@@ -42,7 +37,13 @@ class XmlColorizer : public GuiTextBoxRegexColorizer
public:
XmlColorizer()
{
text::ColorEntry entry = GetCurrentTheme()->GetDefaultTextBoxColorEntry();
text::ColorEntry entry;
entry.normal.text = Color(255, 255, 255);
entry.normal.background = Color(0, 0, 0, 0);
entry.selectedFocused.text = Color(255, 255, 255);
entry.selectedFocused.background = Color(0, 122, 204);
entry.selectedUnfocused.text = Color(255, 255, 255);
entry.selectedUnfocused.background = Color(0, 122, 204);
SetDefaultColor(entry);
entry.normal.text = Color(0, 128, 0);
@@ -51,7 +52,7 @@ public:
entry.normal.text = Color(128, 0, 255);
AddToken(L"/<!/[CDATA/[([^/]]|/][^/]]|/]/][^>])*/]/]/>", entry);
entry.normal.text = Color(0, 0, 0);
entry.normal.text = Color(255, 255, 255);
AddToken(L"\"[^\"]*\"", entry);
entry.normal.text = Color(0, 0, 255);
@@ -38,7 +38,7 @@
</Doc>
<Instance name="AboutWindowResource">
<Instance ref.CodeBehind="true" ref.Class="demo::AboutWindow">
<Window ref.Name="self" Text="About TextEditor" ClientSize="x:480 y:320" MaximizedBox="false" MinimizedBox="false" SizeBox="false">
<Window ref.Name="self" Text="About TextEditor" ClientSize="x:480 y:360" MaximizedBox="false" MinimizedBox="false" SizeBox="false">
<Table AlignmentToParent="left:0 top:0 right:0 bottom:0" CellPadding="5">
<att.Rows>
@@ -1 +1 @@
..\..\..\..\Tools\GacGen.exe Resource.xml
%~dp0..\..\..\..\Tools\GacGen Resource.xml
@@ -8,6 +8,12 @@ https://github.com/vczh-libraries
***********************************************************************/
#include "Demo.h"
/* CodePack:BeginIgnore() */
#ifndef VCZH_DEBUG_NO_REFLECTION
/* CodePack:ConditionOff(VCZH_DEBUG_NO_REFLECTION, DemoReflection.h) */
#include "DemoReflection.h"
#endif
/* CodePack:EndIgnore() */
#if defined( _MSC_VER)
#pragma warning(push)
@@ -48,7 +54,7 @@ namespace demo
AboutWindow::~AboutWindow()
{
this->FinalizeInstanceRecursively(static_cast<::vl::presentation::controls::GuiControl*>(this));
this->FinalizeInstanceRecursively(static_cast<::vl::presentation::controls::GuiControlHost*>(this));
}
}
@@ -1,4 +1,4 @@
/***********************************************************************
/***********************************************************************
!!!!!! DO NOT MODIFY !!!!!!
GacGen.exe Resource.xml
@@ -15,28 +15,4 @@ https://github.com/vczh-libraries
#include "FindWindow.h"
#include "MainWindow.h"
/***********************************************************************
Reflection
***********************************************************************/
namespace vl
{
namespace reflection
{
namespace description
{
#ifndef VCZH_DEBUG_NO_REFLECTION
DECL_TYPE_INFO(::demo::AboutWindow)
DECL_TYPE_INFO(::demo::AboutWindowConstructor)
DECL_TYPE_INFO(::demo::FindWindow)
DECL_TYPE_INFO(::demo::FindWindowConstructor)
DECL_TYPE_INFO(::demo::MainWindow)
DECL_TYPE_INFO(::demo::MainWindowConstructor)
#endif
extern bool LoadDemoTypes();
}
}
}
#endif
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,260 @@
/***********************************************************************
!!!!!! DO NOT MODIFY !!!!!!
GacGen.exe Resource.xml
This file is generated by Workflow compiler
https://github.com/vczh-libraries
***********************************************************************/
#include "DemoReflection.h"
#if defined( _MSC_VER)
#pragma warning(push)
#pragma warning(disable:4250)
#elif defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wparentheses-equality"
#elif defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wparentheses-equality"
#endif
/***********************************************************************
Reflection
***********************************************************************/
namespace vl
{
namespace reflection
{
namespace description
{
#ifndef VCZH_DEBUG_NO_REFLECTION
IMPL_CPP_TYPE_INFO(demo::AboutWindow)
IMPL_CPP_TYPE_INFO(demo::AboutWindowConstructor)
IMPL_CPP_TYPE_INFO(demo::FindWindow)
IMPL_CPP_TYPE_INFO(demo::FindWindowConstructor)
IMPL_CPP_TYPE_INFO(demo::MainWindow)
IMPL_CPP_TYPE_INFO(demo::MainWindowConstructor)
#define _ ,
BEGIN_CLASS_MEMBER(::demo::AboutWindow)
CLASS_MEMBER_CONSTRUCTOR(::demo::AboutWindow*(), NO_PARAMETER)
CLASS_MEMBER_METHOD(documentLabel_ActiveHyperlinkExecuted, { L"sender" _ L"arguments" })
END_CLASS_MEMBER(::demo::AboutWindow)
BEGIN_CLASS_MEMBER(::demo::AboutWindowConstructor)
CLASS_MEMBER_CONSTRUCTOR(::vl::Ptr<::demo::AboutWindowConstructor>(), NO_PARAMETER)
CLASS_MEMBER_METHOD(__vwsn_initialize_instance_, { L"__vwsn_this_" })
CLASS_MEMBER_FIELD(__vwsn_precompile_0)
CLASS_MEMBER_FIELD(__vwsn_precompile_1)
CLASS_MEMBER_FIELD(__vwsn_precompile_2)
CLASS_MEMBER_FIELD(__vwsn_precompile_3)
CLASS_MEMBER_FIELD(__vwsn_precompile_4)
CLASS_MEMBER_FIELD(__vwsn_precompile_5)
CLASS_MEMBER_FIELD(__vwsn_precompile_6)
CLASS_MEMBER_FIELD(__vwsn_precompile_7)
CLASS_MEMBER_FIELD(documentLabel)
CLASS_MEMBER_FIELD(self)
END_CLASS_MEMBER(::demo::AboutWindowConstructor)
BEGIN_CLASS_MEMBER(::demo::FindWindow)
CLASS_MEMBER_CONSTRUCTOR(::demo::FindWindow*(), NO_PARAMETER)
CLASS_MEMBER_METHOD(FindNext, { L"toFind" _ L"caseSensitive" _ L"down" })
CLASS_MEMBER_FIELD(textBox)
END_CLASS_MEMBER(::demo::FindWindow)
BEGIN_CLASS_MEMBER(::demo::FindWindowConstructor)
CLASS_MEMBER_CONSTRUCTOR(::vl::Ptr<::demo::FindWindowConstructor>(), NO_PARAMETER)
CLASS_MEMBER_METHOD(__vwsn_initialize_instance_, { L"__vwsn_this_" })
CLASS_MEMBER_FIELD(__vwsn_precompile_0)
CLASS_MEMBER_FIELD(__vwsn_precompile_1)
CLASS_MEMBER_FIELD(__vwsn_precompile_10)
CLASS_MEMBER_FIELD(__vwsn_precompile_11)
CLASS_MEMBER_FIELD(__vwsn_precompile_12)
CLASS_MEMBER_FIELD(__vwsn_precompile_13)
CLASS_MEMBER_FIELD(__vwsn_precompile_14)
CLASS_MEMBER_FIELD(__vwsn_precompile_15)
CLASS_MEMBER_FIELD(__vwsn_precompile_16)
CLASS_MEMBER_FIELD(__vwsn_precompile_17)
CLASS_MEMBER_FIELD(__vwsn_precompile_18)
CLASS_MEMBER_FIELD(__vwsn_precompile_19)
CLASS_MEMBER_FIELD(__vwsn_precompile_2)
CLASS_MEMBER_FIELD(__vwsn_precompile_20)
CLASS_MEMBER_FIELD(__vwsn_precompile_21)
CLASS_MEMBER_FIELD(__vwsn_precompile_22)
CLASS_MEMBER_FIELD(__vwsn_precompile_3)
CLASS_MEMBER_FIELD(__vwsn_precompile_4)
CLASS_MEMBER_FIELD(__vwsn_precompile_5)
CLASS_MEMBER_FIELD(__vwsn_precompile_6)
CLASS_MEMBER_FIELD(__vwsn_precompile_7)
CLASS_MEMBER_FIELD(__vwsn_precompile_8)
CLASS_MEMBER_FIELD(__vwsn_precompile_9)
CLASS_MEMBER_FIELD(checkCase)
CLASS_MEMBER_FIELD(dialogContentNotFound)
CLASS_MEMBER_FIELD(groupDirection)
CLASS_MEMBER_FIELD(radioDown)
CLASS_MEMBER_FIELD(radioUp)
CLASS_MEMBER_FIELD(self)
CLASS_MEMBER_FIELD(textFind)
END_CLASS_MEMBER(::demo::FindWindowConstructor)
BEGIN_CLASS_MEMBER(::demo::MainWindow)
CLASS_MEMBER_CONSTRUCTOR(::demo::MainWindow*(), NO_PARAMETER)
CLASS_MEMBER_METHOD(CanCloseFile, NO_PARAMETER)
CLASS_MEMBER_METHOD(OpenFile, { L"filterIndex" })
CLASS_MEMBER_METHOD(SaveFile, { L"saveAs" })
CLASS_MEMBER_METHOD(SetupTextConfig, NO_PARAMETER)
CLASS_MEMBER_METHOD(SetupXmlConfig, NO_PARAMETER)
CLASS_MEMBER_METHOD(commandAbout_Executed, { L"sender" _ L"arguments" })
CLASS_MEMBER_METHOD(commandEditCopy_Executed, { L"sender" _ L"arguments" })
CLASS_MEMBER_METHOD(commandEditCut_Executed, { L"sender" _ L"arguments" })
CLASS_MEMBER_METHOD(commandEditDelete_Executed, { L"sender" _ L"arguments" })
CLASS_MEMBER_METHOD(commandEditFind_Executed, { L"sender" _ L"arguments" })
CLASS_MEMBER_METHOD(commandEditPaste_Executed, { L"sender" _ L"arguments" })
CLASS_MEMBER_METHOD(commandEditRedo_Executed, { L"sender" _ L"arguments" })
CLASS_MEMBER_METHOD(commandEditSelect_Executed, { L"sender" _ L"arguments" })
CLASS_MEMBER_METHOD(commandEditUndo_Executed, { L"sender" _ L"arguments" })
CLASS_MEMBER_METHOD(commandFileExit_Executed, { L"sender" _ L"arguments" })
CLASS_MEMBER_METHOD(commandFileNewText_Executed, { L"sender" _ L"arguments" })
CLASS_MEMBER_METHOD(commandFileNewXml_Executed, { L"sender" _ L"arguments" })
CLASS_MEMBER_METHOD(commandFileOpenText_Executed, { L"sender" _ L"arguments" })
CLASS_MEMBER_METHOD(commandFileOpenXml_Executed, { L"sender" _ L"arguments" })
CLASS_MEMBER_METHOD(commandFileOpen_Executed, { L"sender" _ L"arguments" })
CLASS_MEMBER_METHOD(commandFileSaveAs_Executed, { L"sender" _ L"arguments" })
CLASS_MEMBER_METHOD(commandFileSave_Executed, { L"sender" _ L"arguments" })
CLASS_MEMBER_METHOD(window_Closing, { L"sender" _ L"arguments" })
CLASS_MEMBER_FIELD(fileName)
CLASS_MEMBER_FIELD(findWindow)
CLASS_MEMBER_FIELD(isXml)
END_CLASS_MEMBER(::demo::MainWindow)
BEGIN_CLASS_MEMBER(::demo::MainWindowConstructor)
CLASS_MEMBER_CONSTRUCTOR(::vl::Ptr<::demo::MainWindowConstructor>(), NO_PARAMETER)
CLASS_MEMBER_METHOD(__vwsn_initialize_instance_, { L"__vwsn_this_" })
CLASS_MEMBER_FIELD(__vwsn_precompile_0)
CLASS_MEMBER_FIELD(__vwsn_precompile_1)
CLASS_MEMBER_FIELD(__vwsn_precompile_10)
CLASS_MEMBER_FIELD(__vwsn_precompile_11)
CLASS_MEMBER_FIELD(__vwsn_precompile_12)
CLASS_MEMBER_FIELD(__vwsn_precompile_13)
CLASS_MEMBER_FIELD(__vwsn_precompile_14)
CLASS_MEMBER_FIELD(__vwsn_precompile_15)
CLASS_MEMBER_FIELD(__vwsn_precompile_16)
CLASS_MEMBER_FIELD(__vwsn_precompile_17)
CLASS_MEMBER_FIELD(__vwsn_precompile_18)
CLASS_MEMBER_FIELD(__vwsn_precompile_19)
CLASS_MEMBER_FIELD(__vwsn_precompile_2)
CLASS_MEMBER_FIELD(__vwsn_precompile_20)
CLASS_MEMBER_FIELD(__vwsn_precompile_21)
CLASS_MEMBER_FIELD(__vwsn_precompile_22)
CLASS_MEMBER_FIELD(__vwsn_precompile_23)
CLASS_MEMBER_FIELD(__vwsn_precompile_24)
CLASS_MEMBER_FIELD(__vwsn_precompile_25)
CLASS_MEMBER_FIELD(__vwsn_precompile_26)
CLASS_MEMBER_FIELD(__vwsn_precompile_27)
CLASS_MEMBER_FIELD(__vwsn_precompile_28)
CLASS_MEMBER_FIELD(__vwsn_precompile_29)
CLASS_MEMBER_FIELD(__vwsn_precompile_3)
CLASS_MEMBER_FIELD(__vwsn_precompile_30)
CLASS_MEMBER_FIELD(__vwsn_precompile_31)
CLASS_MEMBER_FIELD(__vwsn_precompile_32)
CLASS_MEMBER_FIELD(__vwsn_precompile_33)
CLASS_MEMBER_FIELD(__vwsn_precompile_34)
CLASS_MEMBER_FIELD(__vwsn_precompile_35)
CLASS_MEMBER_FIELD(__vwsn_precompile_36)
CLASS_MEMBER_FIELD(__vwsn_precompile_37)
CLASS_MEMBER_FIELD(__vwsn_precompile_38)
CLASS_MEMBER_FIELD(__vwsn_precompile_39)
CLASS_MEMBER_FIELD(__vwsn_precompile_4)
CLASS_MEMBER_FIELD(__vwsn_precompile_40)
CLASS_MEMBER_FIELD(__vwsn_precompile_41)
CLASS_MEMBER_FIELD(__vwsn_precompile_42)
CLASS_MEMBER_FIELD(__vwsn_precompile_43)
CLASS_MEMBER_FIELD(__vwsn_precompile_44)
CLASS_MEMBER_FIELD(__vwsn_precompile_45)
CLASS_MEMBER_FIELD(__vwsn_precompile_46)
CLASS_MEMBER_FIELD(__vwsn_precompile_47)
CLASS_MEMBER_FIELD(__vwsn_precompile_48)
CLASS_MEMBER_FIELD(__vwsn_precompile_49)
CLASS_MEMBER_FIELD(__vwsn_precompile_5)
CLASS_MEMBER_FIELD(__vwsn_precompile_50)
CLASS_MEMBER_FIELD(__vwsn_precompile_51)
CLASS_MEMBER_FIELD(__vwsn_precompile_52)
CLASS_MEMBER_FIELD(__vwsn_precompile_53)
CLASS_MEMBER_FIELD(__vwsn_precompile_54)
CLASS_MEMBER_FIELD(__vwsn_precompile_55)
CLASS_MEMBER_FIELD(__vwsn_precompile_56)
CLASS_MEMBER_FIELD(__vwsn_precompile_57)
CLASS_MEMBER_FIELD(__vwsn_precompile_6)
CLASS_MEMBER_FIELD(__vwsn_precompile_7)
CLASS_MEMBER_FIELD(__vwsn_precompile_8)
CLASS_MEMBER_FIELD(__vwsn_precompile_9)
CLASS_MEMBER_FIELD(commandAbout)
CLASS_MEMBER_FIELD(commandEditCopy)
CLASS_MEMBER_FIELD(commandEditCut)
CLASS_MEMBER_FIELD(commandEditDelete)
CLASS_MEMBER_FIELD(commandEditFind)
CLASS_MEMBER_FIELD(commandEditPaste)
CLASS_MEMBER_FIELD(commandEditRedo)
CLASS_MEMBER_FIELD(commandEditSelect)
CLASS_MEMBER_FIELD(commandEditUndo)
CLASS_MEMBER_FIELD(commandFileExit)
CLASS_MEMBER_FIELD(commandFileNewText)
CLASS_MEMBER_FIELD(commandFileNewXml)
CLASS_MEMBER_FIELD(commandFileOpen)
CLASS_MEMBER_FIELD(commandFileOpenText)
CLASS_MEMBER_FIELD(commandFileOpenXml)
CLASS_MEMBER_FIELD(commandFileSave)
CLASS_MEMBER_FIELD(commandFileSaveAs)
CLASS_MEMBER_FIELD(dialogCannotOpen)
CLASS_MEMBER_FIELD(dialogCannotSave)
CLASS_MEMBER_FIELD(dialogOpen)
CLASS_MEMBER_FIELD(dialogQueryClose)
CLASS_MEMBER_FIELD(dialogSave)
CLASS_MEMBER_FIELD(self)
CLASS_MEMBER_FIELD(textBox)
END_CLASS_MEMBER(::demo::MainWindowConstructor)
#undef _
class DemoTypeLoader : public Object, public ITypeLoader
{
public:
void Load(ITypeManager* manager)
{
ADD_TYPE_INFO(::demo::AboutWindow)
ADD_TYPE_INFO(::demo::AboutWindowConstructor)
ADD_TYPE_INFO(::demo::FindWindow)
ADD_TYPE_INFO(::demo::FindWindowConstructor)
ADD_TYPE_INFO(::demo::MainWindow)
ADD_TYPE_INFO(::demo::MainWindowConstructor)
}
void Unload(ITypeManager* manager)
{
}
};
#endif
bool LoadDemoTypes()
{
#ifndef VCZH_DEBUG_NO_REFLECTION
if (auto manager = GetGlobalTypeManager())
{
return manager->AddTypeLoader(MakePtr<DemoTypeLoader>());
}
#endif
return false;
}
}
}
}
#if defined( _MSC_VER)
#pragma warning(pop)
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#elif defined(__clang__)
#pragma clang diagnostic pop
#endif
@@ -0,0 +1,58 @@
/***********************************************************************
!!!!!! DO NOT MODIFY !!!!!!
GacGen.exe Resource.xml
This file is generated by Workflow compiler
https://github.com/vczh-libraries
***********************************************************************/
#ifndef VCZH_WORKFLOW_COMPILER_GENERATED_DEMOREFLECTION
#define VCZH_WORKFLOW_COMPILER_GENERATED_DEMOREFLECTION
#include "Demo.h"
#if defined( _MSC_VER)
#pragma warning(push)
#pragma warning(disable:4250)
#elif defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wparentheses-equality"
#elif defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wparentheses-equality"
#endif
/***********************************************************************
Reflection
***********************************************************************/
namespace vl
{
namespace reflection
{
namespace description
{
#ifndef VCZH_DEBUG_NO_REFLECTION
DECL_TYPE_INFO(::demo::AboutWindow)
DECL_TYPE_INFO(::demo::AboutWindowConstructor)
DECL_TYPE_INFO(::demo::FindWindow)
DECL_TYPE_INFO(::demo::FindWindowConstructor)
DECL_TYPE_INFO(::demo::MainWindow)
DECL_TYPE_INFO(::demo::MainWindowConstructor)
#endif
extern bool LoadDemoTypes();
}
}
}
#if defined( _MSC_VER)
#pragma warning(pop)
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#elif defined(__clang__)
#pragma clang diagnostic pop
#endif
#endif
@@ -8,6 +8,12 @@ https://github.com/vczh-libraries
***********************************************************************/
#include "Demo.h"
/* CodePack:BeginIgnore() */
#ifndef VCZH_DEBUG_NO_REFLECTION
/* CodePack:ConditionOff(VCZH_DEBUG_NO_REFLECTION, DemoReflection.h) */
#include "DemoReflection.h"
#endif
/* CodePack:EndIgnore() */
#if defined( _MSC_VER)
#pragma warning(push)
@@ -101,7 +107,7 @@ namespace demo
FindWindow::~FindWindow()
{
this->FinalizeInstanceRecursively(static_cast<::vl::presentation::controls::GuiControl*>(this));
this->FinalizeInstanceRecursively(static_cast<::vl::presentation::controls::GuiControlHost*>(this));
}
}
@@ -8,6 +8,12 @@ https://github.com/vczh-libraries
***********************************************************************/
#include "Demo.h"
/* CodePack:BeginIgnore() */
#ifndef VCZH_DEBUG_NO_REFLECTION
/* CodePack:ConditionOff(VCZH_DEBUG_NO_REFLECTION, DemoReflection.h) */
#include "DemoReflection.h"
#endif
/* CodePack:EndIgnore() */
#if defined( _MSC_VER)
#pragma warning(push)
@@ -53,7 +59,7 @@ namespace demo
}
USERIMPL(/* ::demo::MainWindow */)
bool MainWindow::OpenFile(::vl::vint32_t filterIndex)
bool MainWindow::OpenFile(::vl::vint filterIndex)
{
if (CanCloseFile())
{
@@ -294,7 +300,7 @@ namespace demo
MainWindow::~MainWindow()
{
this->FinalizeInstanceRecursively(static_cast<::vl::presentation::controls::GuiControl*>(this));
this->FinalizeInstanceRecursively(static_cast<::vl::presentation::controls::GuiControlHost*>(this));
}
}
@@ -310,9 +316,3 @@ namespace demo
#elif defined(__clang__)
#pragma clang diagnostic pop
#endif
// UNUSED_USER_CONTENT:
// USERIMPL(/* ::demo::MainWindow */)
// bool MainWindow::CanCLoseFile()
// {
// throw ::vl::Exception(L"You should implement this function.");
// }
@@ -63,7 +63,7 @@ namespace demo
#endif
public:
bool CanCloseFile();
bool OpenFile(::vl::vint32_t filterIndex);
bool OpenFile(::vl::vint filterIndex);
bool SaveFile(bool saveAs);
void SetupTextConfig();
void SetupXmlConfig();