diff options
| author | Dan Gudmundsson <dgud@erlang.org> | 2020-09-30 08:36:21 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <dgud@erlang.org> | 2020-12-21 12:04:28 +0100 |
| commit | 0e80c1c8c102df6e2cdac7e2636b07b3a719797e (patch) | |
| tree | 2d6100b1be9a4247b85238ae5fc99145ff7b949d /lib/observer | |
| parent | f67cd49710dbe0b866fd614a06194932476671b5 (diff) | |
| download | erlang-0e80c1c8c102df6e2cdac7e2636b07b3a719797e.tar.gz | |
EXTERNAL APPS COMPAT
Diffstat (limited to 'lib/observer')
| -rw-r--r-- | lib/observer/src/cdv_wx.erl | 2 | ||||
| -rw-r--r-- | lib/observer/src/observer_traceoptions_wx.erl | 1 | ||||
| -rw-r--r-- | lib/observer/src/observer_wx.erl | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/lib/observer/src/cdv_wx.erl b/lib/observer/src/cdv_wx.erl index 8ad5da857e..50123f5d85 100644 --- a/lib/observer/src/cdv_wx.erl +++ b/lib/observer/src/cdv_wx.erl @@ -229,7 +229,7 @@ setup(#state{frame=Frame, notebook=Notebook}=State) -> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%Callbacks -handle_event(#wx{event=#wxNotebook{type=command_notebook_page_changing}}, +handle_event(#wx{event=#wxBookCtrl{type=command_notebook_page_changing}}, #state{active_tab=Previous} = State) -> case get_active_pid(State) of Previous -> {noreply, State}; diff --git a/lib/observer/src/observer_traceoptions_wx.erl b/lib/observer/src/observer_traceoptions_wx.erl index 514d55ff24..bc80e63bda 100644 --- a/lib/observer/src/observer_traceoptions_wx.erl +++ b/lib/observer/src/observer_traceoptions_wx.erl @@ -609,7 +609,6 @@ create_styled_txtctrl(Parent) -> {?wxSTC_ERLANG_CHARACTER,{236,155,172}}, {?wxSTC_ERLANG_MACRO, {40,144,170}}, {?wxSTC_ERLANG_RECORD, {40,100,20}}, - {?wxSTC_ERLANG_SEPARATOR,{0,0,0}}, {?wxSTC_ERLANG_NODE_NAME,{0,0,0}}], SetStyle = fun({Style, Color}) -> wxStyledTextCtrl:styleSetFont(Ed, Style, FixedFont), diff --git a/lib/observer/src/observer_wx.erl b/lib/observer/src/observer_wx.erl index de7d821030..12ca63350d 100644 --- a/lib/observer/src/observer_wx.erl +++ b/lib/observer/src/observer_wx.erl @@ -222,7 +222,7 @@ setup(#state{frame = Frame} = State) -> nodes = Nodes }, %% Create resources which we don't want to duplicate - SysFont = wxSystemSettings:getFont(?wxSYS_SYSTEM_FIXED_FONT), + SysFont = wxSystemSettings:getFont(?wxSYS_OEM_FIXED_FONT), %% OemFont = wxSystemSettings:getFont(?wxSYS_OEM_FIXED_FONT), %% io:format("Sz sys ~p(~p) oem ~p(~p)~n", %% [wxFont:getPointSize(SysFont), wxFont:isFixedWidth(SysFont), @@ -240,7 +240,7 @@ setup(#state{frame = Frame} = State) -> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%Callbacks -handle_event(#wx{event=#wxNotebook{type=command_notebook_page_changed, nSel=Next}}, +handle_event(#wx{event=#wxBookCtrl{type=command_notebook_page_changed, nSel=Next}}, #state{active_tab=Previous, node=Node, panels=Panels, status_bar=SB} = State) -> {_, Obj, _} = lists:nth(Next+1, Panels), case wx_object:get_pid(Obj) of |