Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cmake-dialogs-sample' of https://github.com/MaartenBent/wxWidgets

Browse Source 
Proper fix for building dialogs sample for CMake.

See https://github.com/wxWidgets/wxWidgets/pull/934
This commit is contained in:
Vadim Zeitlin
2018-09-17 23:31:55 +02:00
parent 764b174199 53dbff2962
commit 698120c225
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/dialogs/dialogs.bkl
View File

@@ -21,10 +21,6 @@
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
$(WXTOPDIR)src/generic/filedlgg.cpp
</if>
<if cond="TOOLKIT=='PM' and WXUNIV=='0' and SHARED=='0'">
$(WXTOPDIR)src/generic/fontdlgg.cpp
$(WXTOPDIR)src/generic/filedlgg.cpp
</if>
</set>
<exe id="dialogs" template="wx_sample" template_append="wx_append">

8
samples/dialogs/dialogs.cpp
View File

@@ -614,15 +614,15 @@ bool MyApp::OnInit()
editMenu->Append(wxID_COPY, "&Copy\tCtrl+C");
editMenu->Append(wxID_PASTE, "&Paste\tCtrl+V");
editMenu->Append(wxID_CLEAR, "&Delete");
editMenu->AppendSeparator();
editMenu->Append(wxID_SELECTALL, "Select All\tCtrl+A");
wxMenuBar *menubar = new wxMenuBar;
menubar->Append(menuDlg, "&Dialogs");
menubar->Append(editMenu, "&Edit");
#if wxUSE_ABOUTDLG
menubar->Append(menuHelp, "&Help");
#endif // wxUSE_ABOUTDLG
@@ -2146,7 +2146,7 @@ private:
if ( !m_taskbarIcon )
{
m_taskbarIcon = new wxTaskBarIcon();
m_taskbarIcon->SetIcon(reinterpret_cast<wxTopLevelWindow*>(GetParent())->GetIcon(),
m_taskbarIcon->SetIcon(reinterpret_cast<wxTopLevelWindow*>(GetParent())->GetIcon(),
"Dialogs Sample (Persistent)");
}
wxNotificationMessage::UseTaskBarIcon(m_taskbarIcon);