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

Fix building display sample without wxUSE_DISPLAY

Browse Source
This commit is contained in:
Maarten Bent
2019-11-21 23:40:34 +01:00
parent c4e54c78fd
commit 136a43f033
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/cmake/samples/CMakeLists.txt
View File

@@ -35,7 +35,7 @@ if(WXGTK2)
endif() endif()
wx_add_sample(dialogs ${SAMPLE_DIALOGS_SRC} DATA tips.txt) wx_add_sample(dialogs ${SAMPLE_DIALOGS_SRC} DATA tips.txt)
wx_add_sample(dialup nettest.cpp LIBRARIES net DEPENDS wxUSE_DIALUP_MANAGER) wx_add_sample(dialup nettest.cpp LIBRARIES net DEPENDS wxUSE_DIALUP_MANAGER)
wx_add_sample(display DEPENDS wxUSE_DISPLAY) wx_add_sample(display)
wx_add_sample(dnd dnd.cpp RES dnd.rc DATA wxwin.png DEPENDS wxUSE_DRAG_AND_DROP) wx_add_sample(dnd dnd.cpp RES dnd.rc DATA wxwin.png DEPENDS wxUSE_DRAG_AND_DROP)
wx_add_sample(docview docview.cpp doc.cpp view.cpp docview.h doc.h view.h wx_add_sample(docview docview.cpp doc.cpp view.cpp docview.h doc.h view.h
RES docview.rc LIBRARIES aui DEPENDS wxUSE_DOC_VIEW_ARCHITECTURE) RES docview.rc LIBRARIES aui DEPENDS wxUSE_DOC_VIEW_ARCHITECTURE)

2
samples/display/display.cpp
View File

@@ -96,6 +96,7 @@ private:
wxDECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };
#if wxUSE_DISPLAY
// Client data class for the choice control containing the video modes // Client data class for the choice control containing the video modes
class MyVideoModeClientData : public wxClientData class MyVideoModeClientData : public wxClientData
{ {
@@ -104,6 +105,7 @@ public:
const wxVideoMode mode; const wxVideoMode mode;
}; };
#endif // wxUSE_DISPLAY
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// constants // constants