Fix for crash on Mac - someone please commit this patch

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Fix for crash on Mac - someone please commit this patch

Milan Babuskov-4
Hi,

I have problem getting sf.net git to work for me, so I'd appreciate if
someone can apply this patch.

It fixes the latest compilation problems and also the bug that crashes
FR on Mac when autocomplete kicks in editor.

I'll upload a 64bit Mac binary package soon as well.

diff --git a/flamerobin.bkl b/flamerobin.bkl
index 6bfe7c4..5245e12 100644
--- a/flamerobin.bkl
+++ b/flamerobin.bkl
@@ -592,6 +592,7 @@ Accepted values: AMD64, IA64.
                 mkdir -p $(BUNDLE)/SharedSupport/conf-defs
                 mkdir -p $(BUNDLE)/SharedSupport/docs
                 mkdir -p $(BUNDLE)/SharedSupport/html-templates
+                mkdir -p $(BUNDLE)/SharedSupport/sys-templates

                 <!-- PkgInfo: -->
                 echo -n "APPL????" >$(BUNDLE)/PkgInfo
@@ -613,6 +614,7 @@ Accepted values: AMD64, IA64.
                 cp -R $(DOLLAR)(srcdir)/conf-defs/*
$(BUNDLE)/SharedSupport/conf-defs
                 cp -R $(DOLLAR)(srcdir)/docs/* $(BUNDLE)/SharedSupport/docs
                 cp -R $(DOLLAR)(srcdir)/html-templates/*
$(BUNDLE)/SharedSupport/html-templates
+                cp -R $(DOLLAR)(srcdir)/sys-templates/*
$(BUNDLE)/SharedSupport/sys-templates
             </command>
         </modify-target>

diff --git a/src/gui/ExecuteSqlFrame.cpp b/src/gui/ExecuteSqlFrame.cpp
index d550728..94a89b6 100644
--- a/src/gui/ExecuteSqlFrame.cpp
+++ b/src/gui/ExecuteSqlFrame.cpp
@@ -393,8 +393,12 @@ void SqlEditor::OnContextMenu(wxContextMenuEvent& event)

 void SqlEditor::OnKillFocus(wxFocusEvent& event)
 {
+// Milan: this makes STC crash on Mac (tested on Mavericks and
Yosemite with wx3.0.1 and 3.0.2
+//        because showing autocomplete box makes the edit control use focus
+#ifndef __WXMAC__
     if (AutoCompActive())
         AutoCompCancel();
+#endif
     if (CallTipActive())
         CallTipCancel();
     event.Skip();   // let the STC do it's job
@@ -1110,7 +1114,7 @@ void
ExecuteSqlFrame::OnSqlEditCharAdded(wxStyledTextEvent& event)
         if (config().get("AutocompleteEnabled", true))
         {
             #ifndef __WXGTK20__
-            bool allow = config().get("autoCompleteQuoted"), true);
+            bool allow = config().get("autoCompleteQuoted", true);
             if (!allow)
             {
                 // needed since event that updates the style happens later
diff --git a/src/gui/PreferencesDialog.cpp b/src/gui/PreferencesDialog.cpp
index 89d3464..9260000 100644
--- a/src/gui/PreferencesDialog.cpp
+++ b/src/gui/PreferencesDialog.cpp
@@ -75,9 +75,9 @@ static const wxString getNodeContent(wxXmlNode*
node, const wxString& defvalue)
 wxString getPlatformName()
 {
 #ifdef __WINDOWS__
-    return "win");
+    return "win";
 #elif defined(__MAC__) || defined(__APPLE__)
-    return "mac");
+    return "mac";
 #elif defined(__UNIX__)
     return "unix";
 #else


--
Milan Babuskov
http://www.guacosoft.com

------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net
_______________________________________________
Flamerobin-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/flamerobin-devel
Reply | Threaded
Open this post in threaded view
|

Re: Fix for crash on Mac - someone please commit this patch

marius adrian popa
Administrator
Patches applied to git , Thank you 

On Sat, Jan 10, 2015 at 11:56 PM, Milan Babuskov <[hidden email]> wrote:
Hi,

I have problem getting sf.net git to work for me, so I'd appreciate if
someone can apply this patch.

It fixes the latest compilation problems and also the bug that crashes
FR on Mac when autocomplete kicks in editor.

I'll upload a 64bit Mac binary package soon as well.

diff --git a/flamerobin.bkl b/flamerobin.bkl
index 6bfe7c4..5245e12 100644
--- a/flamerobin.bkl
+++ b/flamerobin.bkl
@@ -592,6 +592,7 @@ Accepted values: AMD64, IA64.
                 mkdir -p $(BUNDLE)/SharedSupport/conf-defs
                 mkdir -p $(BUNDLE)/SharedSupport/docs
                 mkdir -p $(BUNDLE)/SharedSupport/html-templates
+                mkdir -p $(BUNDLE)/SharedSupport/sys-templates

                 <!-- PkgInfo: -->
                 echo -n "APPL????" >$(BUNDLE)/PkgInfo
@@ -613,6 +614,7 @@ Accepted values: AMD64, IA64.
                 cp -R $(DOLLAR)(srcdir)/conf-defs/*
$(BUNDLE)/SharedSupport/conf-defs
                 cp -R $(DOLLAR)(srcdir)/docs/* $(BUNDLE)/SharedSupport/docs
                 cp -R $(DOLLAR)(srcdir)/html-templates/*
$(BUNDLE)/SharedSupport/html-templates
+                cp -R $(DOLLAR)(srcdir)/sys-templates/*
$(BUNDLE)/SharedSupport/sys-templates
             </command>
         </modify-target>

diff --git a/src/gui/ExecuteSqlFrame.cpp b/src/gui/ExecuteSqlFrame.cpp
index d550728..94a89b6 100644
--- a/src/gui/ExecuteSqlFrame.cpp
+++ b/src/gui/ExecuteSqlFrame.cpp
@@ -393,8 +393,12 @@ void SqlEditor::OnContextMenu(wxContextMenuEvent& event)

 void SqlEditor::OnKillFocus(wxFocusEvent& event)
 {
+// Milan: this makes STC crash on Mac (tested on Mavericks and
Yosemite with wx3.0.1 and 3.0.2
+//        because showing autocomplete box makes the edit control use focus
+#ifndef __WXMAC__
     if (AutoCompActive())
         AutoCompCancel();
+#endif
     if (CallTipActive())
         CallTipCancel();
     event.Skip();   // let the STC do it's job
@@ -1110,7 +1114,7 @@ void
ExecuteSqlFrame::OnSqlEditCharAdded(wxStyledTextEvent& event)
         if (config().get("AutocompleteEnabled", true))
         {
             #ifndef __WXGTK20__
-            bool allow = config().get("autoCompleteQuoted"), true);
+            bool allow = config().get("autoCompleteQuoted", true);
             if (!allow)
             {
                 // needed since event that updates the style happens later
diff --git a/src/gui/PreferencesDialog.cpp b/src/gui/PreferencesDialog.cpp
index 89d3464..9260000 100644
--- a/src/gui/PreferencesDialog.cpp
+++ b/src/gui/PreferencesDialog.cpp
@@ -75,9 +75,9 @@ static const wxString getNodeContent(wxXmlNode*
node, const wxString& defvalue)
 wxString getPlatformName()
 {
 #ifdef __WINDOWS__
-    return "win");
+    return "win";
 #elif defined(__MAC__) || defined(__APPLE__)
-    return "mac");
+    return "mac";
 #elif defined(__UNIX__)
     return "unix";
 #else


--
Milan Babuskov
http://www.guacosoft.com

------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net
_______________________________________________
Flamerobin-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/flamerobin-devel


------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net
_______________________________________________
Flamerobin-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/flamerobin-devel