132 lines
5.2 KiB
Diff
132 lines
5.2 KiB
Diff
From 427af358d41deb00a4628e5b39c63a929cef894a Mon Sep 17 00:00:00 2001
|
|
From: Eran Ifrah <eran@codelite.org>
|
|
Date: Fri, 10 Jun 2022 10:15:52 +0300
|
|
Subject: [PATCH] macos: hunspell: use the library from brew fixed build
|
|
against wx3.1.7 temporarly: disable building LLDB on macos
|
|
|
|
---
|
|
CMakeLists.txt | 5 +-
|
|
SpellChecker/CMakeLists.txt | 27 +-
|
|
sdk/hunspell/include/affentry.hxx | 144 -----------
|
|
sdk/hunspell/include/affixmgr.hxx | 252 -------------------
|
|
sdk/hunspell/include/atypes.hxx | 107 --------
|
|
sdk/hunspell/include/baseaffix.hxx | 32 ---
|
|
sdk/hunspell/include/csutil.hxx | 223 ----------------
|
|
sdk/hunspell/include/dictmgr.hxx | 39 ---
|
|
sdk/hunspell/include/filemgr.hxx | 28 ---
|
|
sdk/hunspell/include/hashmgr.hxx | 69 -----
|
|
sdk/hunspell/include/htypes.hxx | 32 ---
|
|
sdk/hunspell/include/hunspell.hxx | 184 --------------
|
|
sdk/hunspell/include/hunzip.hxx | 47 ----
|
|
sdk/hunspell/include/langnum.hxx | 38 ---
|
|
sdk/hunspell/include/phonet.hxx | 52 ----
|
|
sdk/hunspell/include/replist.hxx | 30 ---
|
|
sdk/hunspell/include/suggestmgr.hxx | 115 ---------
|
|
sdk/hunspell/include/w_char.hxx | 21 --
|
|
sdk/hunspell/lib/osx/libhunspell-1.3.0.dylib | Bin 363876 -> 0 bytes
|
|
wxcrafter/myxh_propgrid.cpp | 32 ++-
|
|
20 files changed, 36 insertions(+), 1441 deletions(-)
|
|
delete mode 100644 sdk/hunspell/include/affentry.hxx
|
|
delete mode 100644 sdk/hunspell/include/affixmgr.hxx
|
|
delete mode 100644 sdk/hunspell/include/atypes.hxx
|
|
delete mode 100644 sdk/hunspell/include/baseaffix.hxx
|
|
delete mode 100644 sdk/hunspell/include/csutil.hxx
|
|
delete mode 100644 sdk/hunspell/include/dictmgr.hxx
|
|
delete mode 100644 sdk/hunspell/include/filemgr.hxx
|
|
delete mode 100644 sdk/hunspell/include/hashmgr.hxx
|
|
delete mode 100644 sdk/hunspell/include/htypes.hxx
|
|
delete mode 100644 sdk/hunspell/include/hunspell.hxx
|
|
delete mode 100644 sdk/hunspell/include/hunzip.hxx
|
|
delete mode 100644 sdk/hunspell/include/langnum.hxx
|
|
delete mode 100644 sdk/hunspell/include/phonet.hxx
|
|
delete mode 100644 sdk/hunspell/include/replist.hxx
|
|
delete mode 100644 sdk/hunspell/include/suggestmgr.hxx
|
|
delete mode 100644 sdk/hunspell/include/w_char.hxx
|
|
delete mode 100755 sdk/hunspell/lib/osx/libhunspell-1.3.0.dylib
|
|
|
|
diff --git a/wxcrafter/myxh_propgrid.cpp b/wxcrafter/myxh_propgrid.cpp
|
|
index 974bc62f0..3fcb3845d 100644
|
|
--- a/wxcrafter/myxh_propgrid.cpp
|
|
+++ b/wxcrafter/myxh_propgrid.cpp
|
|
@@ -1,4 +1,5 @@
|
|
#include "myxh_propgrid.h"
|
|
+
|
|
#include <wx/datetime.h>
|
|
#include <wx/log.h>
|
|
#include <wx/propgrid/advprops.h>
|
|
@@ -48,10 +49,14 @@ wxObject* MyWxPropGridXmlHandler::DoCreateResource()
|
|
|
|
// add the splitter property after the children were added
|
|
int splitterLeft = GetBool("splitterleft");
|
|
- if(splitterLeft) { m_pgmgr->GetPage(0)->SetSplitterLeft(); }
|
|
+ if(splitterLeft) {
|
|
+ m_pgmgr->SetSplitterLeft();
|
|
+ }
|
|
|
|
int splitterPos = GetLong("splitterpos", wxNOT_FOUND);
|
|
- if(splitterPos != wxNOT_FOUND) { m_pgmgr->GetPage(0)->SetSplitterPosition(splitterPos); }
|
|
+ if(splitterPos != wxNOT_FOUND) {
|
|
+ m_pgmgr->GetPage(0)->SetSplitterPosition(splitterPos);
|
|
+ }
|
|
|
|
m_isInside = false;
|
|
return m_pgmgr;
|
|
@@ -67,7 +72,9 @@ bool MyWxPropGridXmlHandler::CanHandle(wxXmlNode* node)
|
|
|
|
void MyWxPropGridXmlHandler::HandlePgProperty(wxPGProperty* parent)
|
|
{
|
|
- if(!HasParam(wxT("proptype"))) { return; }
|
|
+ if(!HasParam(wxT("proptype"))) {
|
|
+ return;
|
|
+ }
|
|
|
|
// Property
|
|
wxString proptype = GetText("proptype");
|
|
@@ -116,7 +123,9 @@ void MyWxPropGridXmlHandler::HandlePgProperty(wxPGProperty* parent)
|
|
|
|
} else if(proptype == "wxEnumProperty") {
|
|
int sel = items.Index(value);
|
|
- if(sel == wxNOT_FOUND) { sel = 0; }
|
|
+ if(sel == wxNOT_FOUND) {
|
|
+ sel = 0;
|
|
+ }
|
|
|
|
prop = DoAppendProperty(parent, new wxEnumProperty(label, wxPG_LABEL, items, wxArrayInt(), sel));
|
|
|
|
@@ -143,8 +152,12 @@ void MyWxPropGridXmlHandler::HandlePgProperty(wxPGProperty* parent)
|
|
|
|
// Handle nested children
|
|
if(prop) {
|
|
- if(bgcol.IsOk()) { prop->SetBackgroundColour(bgcol, bgcolRecurse); }
|
|
- if(!propEditor.IsEmpty()) { prop->SetEditor(propEditor); }
|
|
+ if(bgcol.IsOk()) {
|
|
+ prop->SetBackgroundColour(bgcol, bgcolRecurse);
|
|
+ }
|
|
+ if(!propEditor.IsEmpty()) {
|
|
+ prop->SetEditor(propEditor);
|
|
+ }
|
|
prop->SetHelpString(tip);
|
|
|
|
// Check to see if this property has children
|
|
@@ -160,12 +173,15 @@ void MyWxPropGridXmlHandler::HandlePgProperty(wxPGProperty* parent)
|
|
|
|
wxArrayString MyWxPropGridXmlHandler::GetArray(const wxXmlNode* node) const
|
|
{
|
|
- if(!node) return wxArrayString();
|
|
+ if(!node)
|
|
+ return wxArrayString();
|
|
|
|
wxArrayString items;
|
|
wxXmlNode* child = node->GetChildren();
|
|
while(child) {
|
|
- if(child->GetName() == "item") { items.Add(child->GetNodeContent()); }
|
|
+ if(child->GetName() == "item") {
|
|
+ items.Add(child->GetNodeContent());
|
|
+ }
|
|
child = child->GetNext();
|
|
}
|
|
return items;
|
|
--
|
|
2.42.0
|
|
|