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

Modify dialogs sample to present also generic colour dialog with alpha support.

Browse Source 
Added separate submenu and menu items to show generic colour dialogs with opacity control enabled/disabled.
This commit is contained in:
Artur Wieczorek
2015-10-29 09:29:46 +01:00
parent fa7c2de28d
commit 8fee6a9a2b
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
samples/dialogs/dialogs.cpp
View File

@@ -221,6 +221,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
#if USE_COLOURDLG_GENERIC #if USE_COLOURDLG_GENERIC
EVT_MENU(DIALOGS_CHOOSE_COLOUR_GENERIC, MyFrame::ChooseColourGeneric) EVT_MENU(DIALOGS_CHOOSE_COLOUR_GENERIC, MyFrame::ChooseColourGeneric)
EVT_MENU(DIALOGS_CHOOSE_COLOUR_GENERIC_ALPHA, MyFrame::ChooseColourGeneric)
#endif // USE_COLOURDLG_GENERIC #endif // USE_COLOURDLG_GENERIC
#if wxUSE_PROGRESSDLG #if wxUSE_PROGRESSDLG
@@ -400,7 +401,10 @@ bool MyApp::OnInit()
#endif // USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC #endif // USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC
#if USE_COLOURDLG_GENERIC #if USE_COLOURDLG_GENERIC
choices_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, wxT("&Choose colour (generic)")); wxMenu *colourGeneric_menu = new wxMenu;
colourGeneric_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, wxT("&No opacity"));
colourGeneric_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC_ALPHA, wxT("&With opacity"));
choices_menu->Append(wxID_ANY, wxT("&Choose colour (generic)"), colourGeneric_menu);
#endif // USE_COLOURDLG_GENERIC #endif // USE_COLOURDLG_GENERIC
#if USE_FONTDLG_GENERIC #if USE_FONTDLG_GENERIC
@@ -741,12 +745,13 @@ void MyFrame::GetColour(wxCommandEvent& WXUNUSED(event))
#if USE_COLOURDLG_GENERIC #if USE_COLOURDLG_GENERIC
void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event)) void MyFrame::ChooseColourGeneric(wxCommandEvent& event)
{ {
m_clrData.SetColour(m_canvas->GetBackgroundColour()); m_clrData.SetColour(m_canvas->GetBackgroundColour());
//FIXME:TODO:This has no effect... //FIXME:TODO:This has no effect...
m_clrData.SetChooseFull(true); m_clrData.SetChooseFull(true);
m_clrData.SetChooseAlpha(event.GetId() == DIALOGS_CHOOSE_COLOUR_GENERIC_ALPHA);
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
{ {

1
samples/dialogs/dialogs.h
View File

@@ -536,6 +536,7 @@ enum
DIALOGS_CHOOSE_COLOUR = wxID_HIGHEST, DIALOGS_CHOOSE_COLOUR = wxID_HIGHEST,
DIALOGS_GET_COLOUR, DIALOGS_GET_COLOUR,
DIALOGS_CHOOSE_COLOUR_GENERIC, DIALOGS_CHOOSE_COLOUR_GENERIC,
DIALOGS_CHOOSE_COLOUR_GENERIC_ALPHA,
DIALOGS_CHOOSE_FONT, DIALOGS_CHOOSE_FONT,
DIALOGS_CHOOSE_FONT_GENERIC, DIALOGS_CHOOSE_FONT_GENERIC,
DIALOGS_MESSAGE_BOX, DIALOGS_MESSAGE_BOX,