X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/957f5ab77abb14c70c60f18196e1e0d39292ee59..b63269cabe710bf0024bce483fa6ebf1331bc034:/contrib/samples/foldbar/foldpanelbar/foldtestpanel.cpp diff --git a/contrib/samples/foldbar/foldpanelbar/foldtestpanel.cpp b/contrib/samples/foldbar/foldpanelbar/foldtestpanel.cpp index d8688d0489..1cebceed64 100644 --- a/contrib/samples/foldbar/foldpanelbar/foldtestpanel.cpp +++ b/contrib/samples/foldbar/foldpanelbar/foldtestpanel.cpp @@ -1,12 +1,13 @@ ///////////////////////////////////////////////////////////////////////////// // Name: foldtestpanel.cpp -// Purpose: +// Purpose: // Author: Jorgen Bodde -// Modified by: -// Created: 06/18/04 22:37:15 -// RCS-ID: -// Copyright: -// Licence: +// Modified by: ABX - 19/12/2004 : possibility of horizontal orientation +// : wxWidgets coding standards +// Created: 18/06/2004 +// RCS-ID: $Id$ +// Copyright: (c) Jorgen Bodde +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #if defined(__GNUG__) && !defined(__APPLE__) @@ -17,7 +18,7 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP @@ -47,8 +48,8 @@ BEGIN_EVENT_TABLE( FoldTestPanel, wxPanel ) ////@begin FoldTestPanel event table entries ////@end FoldTestPanel event table entries - //EVT_CAPTIONBAR(-1, FoldTestPanel::OnCaptionPanel) - EVT_CAPTIONBAR(wxID_ANY, FoldTestPanel::OnCaptionPanel) + //EVT_CAPTIONBAR(wxID_ANY, FoldTestPanel::OnCaptionPanel) + EVT_CAPTIONBAR(wxID_ANY, FoldTestPanel::OnCaptionPanel) END_EVENT_TABLE() @@ -59,7 +60,7 @@ END_EVENT_TABLE() FoldTestPanel::FoldTestPanel( ) { - delete _images; + delete m_images; } FoldTestPanel::FoldTestPanel( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) @@ -71,7 +72,7 @@ FoldTestPanel::FoldTestPanel( wxWindow* parent, wxWindowID id, const wxString& c * FoldTestPanel creator */ -bool FoldTestPanel::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) +bool FoldTestPanel::Create( wxWindow* parent, wxWindowID id, const wxString& WXUNUSED(caption), const wxPoint& pos, const wxSize& size, long style ) { ////@begin FoldTestPanel member initialisation blaat = NULL; @@ -86,7 +87,7 @@ bool FoldTestPanel::Create( wxWindow* parent, wxWindowID id, const wxString& cap GetSizer()->SetSizeHints(this); Centre(); ////@end FoldTestPanel creation - return TRUE; + return true; } /*! @@ -94,7 +95,7 @@ bool FoldTestPanel::Create( wxWindow* parent, wxWindowID id, const wxString& cap */ void FoldTestPanel::CreateControls() -{ +{ ////@begin FoldTestPanel content construction @@ -103,13 +104,13 @@ void FoldTestPanel::CreateControls() wxBoxSizer* item2 = new wxBoxSizer(wxVERTICAL); blaat = item2; item1->SetSizer(item2); - item1->SetAutoLayout(TRUE); - /* wxPanel* item3 = new wxPanel( item1, ID_PANEL, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL ); */ - wxPanel* item3 = new wxPanel( item1, ID_PANEL, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL ); + item1->SetAutoLayout(true); + /* wxPanel* item3 = new wxPanel( item1, ID_PANEL, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL ); */ + wxPanel* item3 = new wxPanel( item1, ID_PANEL, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL ); item2->Add(item3, 1, wxGROW|wxADJUST_MINSIZE, 5); wxBoxSizer* item4 = new wxBoxSizer(wxVERTICAL); item3->SetSizer(item4); - item3->SetAutoLayout(TRUE); + item3->SetAutoLayout(true); wxString item5Strings[] = { _("One"), _("Two"), @@ -120,17 +121,17 @@ void FoldTestPanel::CreateControls() wxTextCtrl* item6 = new wxTextCtrl( item3, ID_TEXTCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); item4->Add(item6, 1, wxGROW|wxALL, 5); wxRadioButton* item7 = new wxRadioButton( item3, ID_RADIOBUTTON, _("I like this"), wxDefaultPosition, wxDefaultSize, 0 ); - item7->SetValue(TRUE); + item7->SetValue(true); item4->Add(item7, 0, wxALIGN_LEFT|wxALL, 5); wxRadioButton* item8 = new wxRadioButton( item3, ID_RADIOBUTTON1, _("I hate it"), wxDefaultPosition, wxDefaultSize, 0 ); - item8->SetValue(FALSE); + item8->SetValue(false); item4->Add(item8, 0, wxALIGN_LEFT|wxALL, 5); ////@end FoldTestPanel content construction } -void FoldTestPanel::OnCaptionPanel(wxCaptionBarEvent &event) +void FoldTestPanel::OnCaptionPanel(wxCaptionBarEvent &WXUNUSED(event)) { - // TODO: What else + // TODO: What else } /*! @@ -139,14 +140,14 @@ void FoldTestPanel::OnCaptionPanel(wxCaptionBarEvent &event) bool FoldTestPanel::ShowToolTips() { - return TRUE; + return true; } /*! * Get bitmap resources */ -wxBitmap FoldTestPanel::GetBitmapResource( const wxString& name ) +wxBitmap FoldTestPanel::GetBitmapResource( const wxString& WXUNUSED(name) ) { // Bitmap retrieval ////@begin FoldTestPanel bitmap retrieval @@ -158,7 +159,7 @@ wxBitmap FoldTestPanel::GetBitmapResource( const wxString& name ) * Get icon resources */ -wxIcon FoldTestPanel::GetIconResource( const wxString& name ) +wxIcon FoldTestPanel::GetIconResource( const wxString& WXUNUSED(name) ) { // Icon retrieval ////@begin FoldTestPanel icon retrieval