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

Smartphone fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-01-06 12:31:46 +00:00
parent 11d1f1599c
commit 923f4e79a2
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/widgets/notebook.cpp
View File

@@ -86,7 +86,7 @@ enum Orient
class NotebookWidgetsPage : public WidgetsPage class NotebookWidgetsPage : public WidgetsPage
{ {
public: public:
NotebookWidgetsPage(wxNotebook *notebook, wxImageList *imaglist); NotebookWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
virtual ~NotebookWidgetsPage(); virtual ~NotebookWidgetsPage();
virtual wxControl *GetWidget() const { return m_notebook; } virtual wxControl *GetWidget() const { return m_notebook; }
@@ -192,9 +192,9 @@ END_EVENT_TABLE()
IMPLEMENT_WIDGETS_PAGE(NotebookWidgetsPage, _T("Notebook")); IMPLEMENT_WIDGETS_PAGE(NotebookWidgetsPage, _T("Notebook"));
NotebookWidgetsPage::NotebookWidgetsPage(wxNotebook *notebook, NotebookWidgetsPage::NotebookWidgetsPage(wxBookCtrl *book,
wxImageList *imaglist) wxImageList *imaglist)
: WidgetsPage(notebook) : WidgetsPage(book)
{ {
imaglist->Add(wxBitmap(notebook_xpm)); imaglist->Add(wxBitmap(notebook_xpm));

8
samples/widgets/widgets.cpp
View File

@@ -401,6 +401,7 @@ void WidgetsFrame::OnButtonClearLog(wxCommandEvent& WXUNUSED(event))
void WidgetsFrame::OnSetFgCol(wxCommandEvent& WXUNUSED(event)) void WidgetsFrame::OnSetFgCol(wxCommandEvent& WXUNUSED(event))
{ {
#if wxUSE_COLOURDLG
wxColour col = wxGetColourFromUser(this, m_colFg); wxColour col = wxGetColourFromUser(this, m_colFg);
if ( !col.Ok() ) if ( !col.Ok() )
return; return;
@@ -410,10 +411,14 @@ void WidgetsFrame::OnSetFgCol(wxCommandEvent& WXUNUSED(event))
WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage); WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
page->GetWidget()->SetForegroundColour(m_colFg); page->GetWidget()->SetForegroundColour(m_colFg);
page->GetWidget()->Refresh(); page->GetWidget()->Refresh();
#else
wxLogMessage(_T("None colour dialog available in current build."));
#endif
} }
void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event)) void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
{ {
#if wxUSE_COLOURDLG
wxColour col = wxGetColourFromUser(this, m_colBg); wxColour col = wxGetColourFromUser(this, m_colBg);
if ( !col.Ok() ) if ( !col.Ok() )
return; return;
@@ -423,6 +428,9 @@ void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage); WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
page->GetWidget()->SetBackgroundColour(m_colBg); page->GetWidget()->SetBackgroundColour(m_colBg);
page->GetWidget()->Refresh(); page->GetWidget()->Refresh();
#else
wxLogMessage(_T("None colour dialog available in current build."));
#endif
} }
#endif // wxUSE_MENUS #endif // wxUSE_MENUS