Full headers, Unicode markup, whitespaces, wxID_ANY, wxDefaultCoord conventions applied.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-08-03 11:55:18 +00:00
parent 957f5ab77a
commit c2a4197860
4 changed files with 742 additions and 712 deletions

View File

@@ -1,3 +1,14 @@
/////////////////////////////////////////////////////////////////////////////
// Name: captionbar.h
// Purpose: wxFoldPanel
// Author: Jorgen Bodde
// Modified by:
// Created: 22/06/2004
// RCS-ID: $Id$
// Copyright: (c) Jorgen Bodde
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __FOLDPANELBAR_H__ #ifndef __FOLDPANELBAR_H__
#define __FOLDPANELBAR_H__ #define __FOLDPANELBAR_H__
@@ -265,7 +276,7 @@ public:
which contains at least two bitmaps. The bitmaps contain the expanded and collapsed icons needed to which contains at least two bitmaps. The bitmaps contain the expanded and collapsed icons needed to
represent it's state. If you don't want images, simply pass a null pointer and the bitmap is disabled. */ represent it's state. If you don't want images, simply pass a null pointer and the bitmap is disabled. */
wxCaptionBar(wxWindow* parent, const wxString &caption, wxImageList *images, wxCaptionBar(wxWindow* parent, const wxString &caption, wxImageList *images,
wxWindowID id = -1, const wxCaptionBarStyle &cbstyle = wxEmptyCaptionBarStyle, wxWindowID id = wxID_ANY, const wxCaptionBarStyle &cbstyle = wxEmptyCaptionBarStyle,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER); const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER);
~wxCaptionBar(); ~wxCaptionBar();
@@ -443,7 +454,7 @@ typedef void (wxEvtHandler::*wxCaptionBarEventFunction)(wxCaptionBarEvent&);
#define EVT_CAPTIONBAR(id, fn) \ #define EVT_CAPTIONBAR(id, fn) \
DECLARE_EVENT_TABLE_ENTRY( \ DECLARE_EVENT_TABLE_ENTRY( \
wxEVT_CAPTIONBAR, id, -1, \ wxEVT_CAPTIONBAR, id, wxID_ANY, \
(wxObjectEventFunction)(wxEventFunction)(wxCaptionBarEventFunction) \ (wxObjectEventFunction)(wxEventFunction)(wxCaptionBarEventFunction) \
& fn, \ & fn, \
(wxObject *) NULL \ (wxObject *) NULL \

View File

@@ -1,3 +1,14 @@
/////////////////////////////////////////////////////////////////////////////
// Name: doc_mainpage.h
// Purpose: wxFoldPanel
// Author: Jorgen Bodde
// Modified by:
// Created: 22/06/2004
// RCS-ID: $Id$
// Copyright: (c) Jorgen Bodde
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/** \author Jorgen Bodde /** \author Jorgen Bodde
\mainpage \mainpage

View File

@@ -1,8 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: wxFoldPanelBar.h // Name: foldpanelbar.h
// Author: XX // Purpose: wxFoldPanel
// Created: Tuesday, June 22, 2004 20:40:00 // Author: Jorgen Bodde
// Copyright: XX // Modified by:
// Created: 22/06/2004
// RCS-ID: $Id$
// Copyright: (c) Jorgen Bodde
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __WXFOLDPANELBAR_H__ #ifndef __WXFOLDPANELBAR_H__
@@ -69,8 +73,8 @@ public:
/** Use this method to obtain the wxPanel derived class to which you need to add your components. For example;<br> /** Use this method to obtain the wxPanel derived class to which you need to add your components. For example;<br>
\code \code
wxFoldPanel item = _pnl->AddFoldPanel("Test me", false); wxFoldPanel item = _pnl->AddFoldPanel(wxT("Test me"), false);
_pnl->AddFoldPanelWindow(item, new wxButton(item.GetParent(), -1, "Press Me")); _pnl->AddFoldPanelWindow(item, new wxButton(item.GetParent(), wxID_ANY, wxT("Press Me")));
\endcode \endcode
*/ */
wxFoldPanelItem *GetParent() const { wxFoldPanelItem *GetParent() const {
@@ -137,7 +141,7 @@ public:
/** One step creation. Look at wxPanel for the argument and style flags. The extraStyle flags are /** One step creation. Look at wxPanel for the argument and style flags. The extraStyle flags are
- wxFPB_DEFAULT_EXTRASTYLE : Takes default styles. - wxFPB_DEFAULT_EXTRASTYLE : Takes default styles.
- wxFPB_COLLAPSE_TO_BOTTOM : When panels are collapsed, they are put at the bottom of the area. */ - wxFPB_COLLAPSE_TO_BOTTOM : When panels are collapsed, they are put at the bottom of the area. */
wxFoldPanelBar( wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, wxFoldPanelBar( wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxFPB_DEFAULT_STYLE, const wxSize& size = wxDefaultSize, long style = wxFPB_DEFAULT_STYLE,
long extraStyle = wxFPB_DEFAULT_EXTRASTYLE); long extraStyle = wxFPB_DEFAULT_EXTRASTYLE);
@@ -146,7 +150,7 @@ public:
/** Two step create call. Use this when the control is not created using the wxPanel derived constructor. /** Two step create call. Use this when the control is not created using the wxPanel derived constructor.
WARNING: Do not create this component more then once! */ WARNING: Do not create this component more then once! */
virtual void Create( wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, virtual void Create( wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxFPB_DEFAULT_STYLE, const wxSize& size = wxDefaultSize, long style = wxFPB_DEFAULT_STYLE,
long extraStyle = wxFPB_DEFAULT_EXTRASTYLE); long extraStyle = wxFPB_DEFAULT_EXTRASTYLE);
@@ -178,14 +182,14 @@ public:
\code \code
// create the wxFoldPanelBar // create the wxFoldPanelBar
_pnl = new wxFoldPanelBar(this, -1, wxDefaultPosition, wxDefaultSize, wxFPB_DEFAULT_STYLE, wxFPB_COLLAPSE_TO_BOTTOM); _pnl = new wxFoldPanelBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFPB_DEFAULT_STYLE, wxFPB_COLLAPSE_TO_BOTTOM);
// add a foldpanel to the control. "Test me" is the caption and it is initially not collapsed. // add a foldpanel to the control. "Test me" is the caption and it is initially not collapsed.
wxFoldPanel item = _pnl->AddFoldPanel("Test me", false); wxFoldPanel item = _pnl->AddFoldPanel(wxT("Test me"), false);
// now add a button to the fold panel. Mind that the button should be made child of the // now add a button to the fold panel. Mind that the button should be made child of the
// wxFoldPanel and not of the main form. // wxFoldPanel and not of the main form.
_pnl->AddFoldPanelWindow(item, new wxButton(item.GetParent(), ID_COLLAPSEME, "Collapse Me")); _pnl->AddFoldPanelWindow(item, new wxButton(item.GetParent(), ID_COLLAPSEME, wxT("Collapse Me")));
// add a separator between the two controls. This is purely a visual line that can have a certain // add a separator between the two controls. This is purely a visual line that can have a certain
// color and also the indents and width alligning like a control. // color and also the indents and width alligning like a control.
@@ -193,7 +197,7 @@ public:
// now add a text ctrl. Also very easy. Allign this on width so that when the control gets wider // now add a text ctrl. Also very easy. Allign this on width so that when the control gets wider
// the text control also sizes along. // the text control also sizes along.
_pnl->AddFoldPanelWindow(item, new wxTextCtrl(item.GetParent(), -1, "Comment"), wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_YSPACING, 20); _pnl->AddFoldPanelWindow(item, new wxTextCtrl(item.GetParent(), wxID_ANY, wxT("Comment")), wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_YSPACING, 20);
\endcode \endcode
*/ */

View File

@@ -1,8 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: wxFoldPanelItem.h // Name: foldpanelitem.h
// Author: XX // Purpose: wxFoldPanel
// Created: Tuesday, June 22, 2004 21:01:02 // Author: Jorgen Bodde
// Copyright: XX // Modified by:
// Created: 22/06/2004
// RCS-ID: $Id$
// Copyright: (c) Jorgen Bodde
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __WXFOLDPANELITEM_H__ #ifndef __WXFOLDPANELITEM_H__
@@ -136,7 +140,7 @@ public:
else else
{ {
wxCHECK2(_wnd, return); wxCHECK2(_wnd, return);
_wnd->SetSize(wxSize(myWidth, -1)); _wnd->SetSize(wxSize(myWidth, wxDefaultCoord));
} }
} }
}; };