From 4400ec08aaa4c30272f502b5d8450dafec30f5dc Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Fri, 21 Dec 2012 14:14:11 +0100
Subject: wx: Workaround wx-2.9 bugs

Menuhandling in 2.9 is (currently) buggy on mac,
this avoids a crash in menu handling but causes a lot unusable menus.
---
 lib/observer/src/observer_pro_wx.erl   |  2 +-
 lib/observer/src/observer_tv_table.erl |  2 +-
 lib/observer/src/observer_wx.erl       | 65 +++++++++++++++++++++-------------
 3 files changed, 42 insertions(+), 27 deletions(-)

(limited to 'lib/observer/src')

diff --git a/lib/observer/src/observer_pro_wx.erl b/lib/observer/src/observer_pro_wx.erl
index ee67664539..9aaf648ea2 100644
--- a/lib/observer/src/observer_pro_wx.erl
+++ b/lib/observer/src/observer_pro_wx.erl
@@ -225,7 +225,7 @@ handle_info({holder_updated, Count}, State0=#state{grid=Grid}) ->
     State = update_selection(State0),
 
     wxListCtrl:setItemCount(Grid, Count),
-    wxListCtrl:refreshItems(Grid, 0, Count-1),
+    Count > 0 andalso wxListCtrl:refreshItems(Grid, 0, Count-1),
 
     {noreply, State};
 
diff --git a/lib/observer/src/observer_tv_table.erl b/lib/observer/src/observer_tv_table.erl
index c41f0f006a..5d1ab2e946 100644
--- a/lib/observer/src/observer_tv_table.erl
+++ b/lib/observer/src/observer_tv_table.erl
@@ -403,7 +403,7 @@ handle_info({new_cols, New}, State = #state{grid=Grid, columns=Cols0}) ->
     {noreply, State#state{columns=Cols}};
 
 handle_info({refresh, Min, Max}, State = #state{grid=Grid}) ->
-    wxListCtrl:refreshItems(Grid, Min, Max),
+    Max > 0 andalso wxListCtrl:refreshItems(Grid, Min, Max),
     {noreply, State};
 
 handle_info(refresh_interval, State = #state{pid=Pid}) ->
diff --git a/lib/observer/src/observer_wx.erl b/lib/observer/src/observer_wx.erl
index 5625e69b6e..47740581f0 100644
--- a/lib/observer/src/observer_wx.erl
+++ b/lib/observer/src/observer_wx.erl
@@ -543,28 +543,36 @@ clean_menus(Menus, MenuBar) ->
     remove_menu_items(Menus, MenuBar).
 
 remove_menu_items([{MenuStr = "File", Menus}|Rest], MenuBar) ->
-    MenuId = wxMenuBar:findMenu(MenuBar, MenuStr),
-    Menu = wxMenuBar:getMenu(MenuBar, MenuId),
-    Items = [wxMenu:findItem(Menu, Tag) || #create_menu{text=Tag} <- Menus],
-    [wxMenu:delete(Menu, MItem) || MItem <- Items],
-    case os:type() =:= {unix, darwin} of
-	true ->
-	    wxMenuBar:remove(MenuBar, MenuId),
-	    wxMenu:destroy(Menu);
-	false ->
-	    ignore
-    end,
-    remove_menu_items(Rest, MenuBar);
+    case wxMenuBar:findMenu(MenuBar, MenuStr) of
+	?wxNOT_FOUND ->
+	    remove_menu_items(Rest, MenuBar);
+	MenuId ->
+	    Menu = wxMenuBar:getMenu(MenuBar, MenuId),
+	    Items = [wxMenu:findItem(Menu, Tag) || #create_menu{text=Tag} <- Menus],
+	    [wxMenu:delete(Menu, MItem) || MItem <- Items],
+	    case os:type() =:= {unix, darwin} of
+	    	true ->
+	    	    wxMenuBar:remove(MenuBar, MenuId),
+	    	    wxMenu:destroy(Menu);
+	    	false ->
+	    	    ignore
+	    end,
+	    remove_menu_items(Rest, MenuBar)
+    end;
 remove_menu_items([{"Nodes", _}|_], _MB) ->
     ok;
 remove_menu_items([{Tag, _Menus}|Rest], MenuBar) ->
-    MenuId = wxMenuBar:findMenu(MenuBar, Tag),
-    Menu = wxMenuBar:getMenu(MenuBar, MenuId),
-    wxMenuBar:remove(MenuBar, MenuId),
-    Items = wxMenu:getMenuItems(Menu),
-    [wxMenu:'Destroy'(Menu, Item) || Item <- Items],
-    wxMenu:destroy(Menu),
-    remove_menu_items(Rest, MenuBar);
+    case wxMenuBar:findMenu(MenuBar, Tag) of
+	?wxNOT_FOUND ->
+	    remove_menu_items(Rest, MenuBar);
+	MenuId ->    
+	    Menu = wxMenuBar:getMenu(MenuBar, MenuId),
+	    wxMenuBar:remove(MenuBar, MenuId),
+	    Items = wxMenu:getMenuItems(Menu),
+	    [wxMenu:'Destroy'(Menu, Item) || Item <- Items],
+	    wxMenu:destroy(Menu),
+	    remove_menu_items(Rest, MenuBar)
+    end;
 remove_menu_items([], _MB) ->
     ok.
 
@@ -592,15 +600,22 @@ epmd_nodes(Names) ->
 
 update_node_list(State = #state{menubar=MenuBar}) ->
     {Nodes, NodesMenuItems} = get_nodes(),
-    NodeMenuId = wxMenuBar:findMenu(MenuBar, "Nodes"),
-    NodeMenu = wxMenuBar:getMenu(MenuBar, NodeMenuId),
-    wx:foreach(fun(Item) -> wxMenu:'Destroy'(NodeMenu, Item) end,
-	       wxMenu:getMenuItems(NodeMenu)),
-
+    NodeMenu = case wxMenuBar:findMenu(MenuBar, "Nodes") of
+		   ?wxNOT_FOUND -> 
+		       Menu = wxMenu:new(),
+		       wxMenuBar:append(MenuBar, Menu, "Nodes"),
+		       Menu;
+		   NodeMenuId ->
+		       Menu = wxMenuBar:getMenu(MenuBar, NodeMenuId),
+		       wx:foreach(fun(Item) -> wxMenu:'Destroy'(Menu, Item) end,
+				  wxMenu:getMenuItems(Menu)),
+		       Menu
+	       end,
+	
     Index = wx:foldl(fun(Record, Index) ->
 			     observer_lib:create_menu_item(Record, NodeMenu, Index)
 		     end, 0, NodesMenuItems),
-
+    
     Dist = case erlang:is_alive() of
 	       true  -> #create_menu{id = ?ID_PING, text = "Connect node"};
 	       false -> #create_menu{id = ?ID_CONNECT, text = "Enable distribution"}
-- 
cgit v1.2.3