Skip to content

Commit aaedcfe

Browse files
author
Eran Ifrah
committed
Extern Tools plugin: ensure that the toolbar buttons are added even when using
native toolbar
1 parent 41dbc0d commit aaedcfe

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

ExternalTools/externaltools.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,7 @@ clToolBar* ExternalToolsPlugin::CreateToolBar(wxWindow* parent)
223223
m_tb->Realize();
224224
} else {
225225
// Using native toolbar
226-
wxFrame* frame = dynamic_cast<wxFrame*>(parent);
227-
CHECK_PTR_RET_NULL(frame);
228-
229-
wxToolBar* toolbar = frame->GetToolBar();
226+
wxToolBar* toolbar = EventNotifier::Get()->TopFrame()->GetToolBar();
230227
CHECK_PTR_RET_NULL(toolbar);
231228

232229
// Add the static tools

LiteEditor.workspace

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
<Project Name="wxsqlite3" ConfigName="Win_x86_Release"/>
100100
<Project Name="ZoomNavigator" ConfigName="Win_x86_Release"/>
101101
</WorkspaceConfiguration>
102-
<WorkspaceConfiguration Name="CMake_Release" Selected="yes">
102+
<WorkspaceConfiguration Name="CMake_Release" Selected="no">
103103
<Project Name="ZoomNavigator" ConfigName="DebugUnicode"/>
104104
<Project Name="wxsqlite3" ConfigName="Win_x86_Release"/>
105105
<Project Name="wxshapeframework" ConfigName="Win_x86_Release"/>
@@ -144,7 +144,7 @@
144144
<Project Name="WebTools" ConfigName="DebugUnicode"/>
145145
<Project Name="HelpPlugin" ConfigName="Win_x64_Debug"/>
146146
</WorkspaceConfiguration>
147-
<WorkspaceConfiguration Name="CMake_Debug" Selected="no">
147+
<WorkspaceConfiguration Name="CMake_Debug" Selected="yes">
148148
<Project Name="ZoomNavigator" ConfigName="Win_x86_Release"/>
149149
<Project Name="wxsqlite3" ConfigName="Win_x86_Release"/>
150150
<Project Name="wxshapeframework" ConfigName="Win_x86_Release"/>

0 commit comments

Comments
 (0)