From: Włodzimierz Skiba Date: Thu, 13 Jan 2005 20:30:21 +0000 (+0000) Subject: Common default notebook name. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/630ad6c6b620b4c24cd5b720b610b539e2770d60?ds=inline Common default notebook name. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/docs/latex/wx/notebook.tex b/docs/latex/wx/notebook.tex index 5e1bea62b8..e3b4287fdf 100644 --- a/docs/latex/wx/notebook.tex +++ b/docs/latex/wx/notebook.tex @@ -54,7 +54,7 @@ See also \helpref{window styles overview}{windowstyles}. Default constructor. \func{}{wxNotebook}{\param{wxWindow*}{ parent}, \param{wxWindowID }{id}, \param{const wxPoint\&}{ pos = wxDefaultPosition}, - \param{const wxSize\&}{ size = wxDefaultSize}, \param{long}{ style = 0}, \param{const wxString\& }{name = "notebook"}} + \param{const wxSize\&}{ size = wxDefaultSize}, \param{long}{ style = 0}, \param{const wxString\& }{name = wxNotebookNameStr}} Constructs a notebook control. @@ -141,7 +141,7 @@ the list. \membersection{wxNotebook::Create}\label{wxnotebookcreate} \func{bool}{Create}{\param{wxWindow*}{ parent}, \param{wxWindowID }{id}, \param{const wxPoint\&}{ pos = wxDefaultPosition}, - \param{const wxSize\&}{ size}, \param{long}{ style = 0}, \param{const wxString\& }{name = "notebook"}} + \param{const wxSize\&}{ size}, \param{long}{ style = 0}, \param{const wxString\& }{name = wxNotebookNameStr}} Creates a notebook control. See \helpref{wxNotebook::wxNotebook}{wxnotebookctor} for a description of the parameters. @@ -233,7 +233,7 @@ used instead in this case. \func{int}{HitTest}{\param{const wxPoint\&}{ pt}, \param{long}{ *flags = {\tt NULL}}} -Returns the index of the tab at the specified position or {\tt wxNOT\_FOUND} +Returns the index of the tab at the specified position or {\tt wxNOT\_FOUND} if none. If {\it flags} parameter is non {\tt NULL}, the position of the point inside the tab is returned as well. diff --git a/include/wx/cocoa/notebook.h b/include/wx/cocoa/notebook.h index fb2a8153e1..5ba76c2d38 100644 --- a/include/wx/cocoa/notebook.h +++ b/include/wx/cocoa/notebook.h @@ -6,7 +6,7 @@ // Created: 2004/04/08 // RCS-ID: $Id$ // Copyright: (c) 2004 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_COCOA_NOTEBOOK_H__ @@ -31,7 +31,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxNOTEBOOK_NAME) + const wxString& name = wxNotebookNameStr) { Create(parent, winid, pos, size, style, name); } @@ -40,7 +40,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxNOTEBOOK_NAME); + const wxString& name = wxNotebookNameStr); virtual ~wxNotebook(); // ------------------------------------------------------------------------ @@ -94,7 +94,7 @@ public: bool InsertPage( size_t position, wxNotebookPage *win, const wxString& strText, - bool bSelect = FALSE, + bool bSelect = false, int imageId = -1 ); protected: diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h index f1307aec63..cb181e61a4 100644 --- a/include/wx/generic/notebook.h +++ b/include/wx/generic/notebook.h @@ -47,14 +47,14 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxT("notebook")); + const wxString& name = wxNotebookNameStr); // Create() function bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxT("notebook")); + const wxString& name = wxNotebookNameStr); // dtor ~wxNotebook(); diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h index 454cf9f01e..43473dc100 100644 --- a/include/wx/gtk/notebook.h +++ b/include/wx/gtk/notebook.h @@ -39,14 +39,14 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxT("notebook")); + const wxString& name = wxNotebookNameStr); // Create() function bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxT("notebook")); + const wxString& name = wxNotebookNameStr); // dtor virtual ~wxNotebook(); @@ -89,7 +89,7 @@ public: bool InsertPage( size_t position, wxNotebookPage *win, const wxString& strText, - bool bSelect = FALSE, + bool bSelect = false, int imageId = -1 ); // handler for tab navigation @@ -99,7 +99,7 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - + // implementation // -------------- @@ -127,7 +127,7 @@ public: // selection internally instead of querying the notebook for it int m_selection; - // flag set to TRUE while we're inside "switch_page" callback + // flag set to true while we're inside "switch_page" callback bool m_inSwitchPage; protected: diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h index 454cf9f01e..43473dc100 100644 --- a/include/wx/gtk1/notebook.h +++ b/include/wx/gtk1/notebook.h @@ -39,14 +39,14 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxT("notebook")); + const wxString& name = wxNotebookNameStr); // Create() function bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxT("notebook")); + const wxString& name = wxNotebookNameStr); // dtor virtual ~wxNotebook(); @@ -89,7 +89,7 @@ public: bool InsertPage( size_t position, wxNotebookPage *win, const wxString& strText, - bool bSelect = FALSE, + bool bSelect = false, int imageId = -1 ); // handler for tab navigation @@ -99,7 +99,7 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - + // implementation // -------------- @@ -127,7 +127,7 @@ public: // selection internally instead of querying the notebook for it int m_selection; - // flag set to TRUE while we're inside "switch_page" callback + // flag set to true while we're inside "switch_page" callback bool m_inSwitchPage; protected: diff --git a/include/wx/mac/carbon/notebook.h b/include/wx/mac/carbon/notebook.h index 3eb50dae82..8f88862122 100644 --- a/include/wx/mac/carbon/notebook.h +++ b/include/wx/mac/carbon/notebook.h @@ -44,18 +44,18 @@ public: wxNotebook(); // the same arguments as for wxControl (@@@ any special styles?) wxNotebook(wxWindow *parent, - wxWindowID id, + wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxT("notebook")); + const wxString& name = wxNotebookNameStr); // Create() function bool Create(wxWindow *parent, - wxWindowID id, + wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxT("notebook")); + const wxString& name = wxNotebookNameStr); // dtor ~wxNotebook(); @@ -83,7 +83,7 @@ public: virtual void SetPadding(const wxSize& padding); // sets the size of the tabs (assumes all tabs are the same size) virtual void SetTabSize(const wxSize& sz); - + // calculate size for wxNotebookSizer wxSize CalcSizeFromPage(const wxSize& sizePage) const; wxRect GetPageRect() const ; @@ -92,7 +92,7 @@ public: int GetPageCount() const; // cycle thru the tabs - void AdvanceSelection(bool bForward = TRUE); + void AdvanceSelection(bool bForward = true); // currently it's always 1 because wxGTK doesn't support multi-row @@ -107,7 +107,7 @@ public: bool InsertPage(size_t nPage, wxNotebookPage *pPage, const wxString& strText, - bool bSelect = FALSE, + bool bSelect = false, int imageId = -1); /* // get the panel which represents the given page @@ -124,7 +124,7 @@ public: // -------------- #if wxUSE_CONSTRAINTS - virtual void SetConstraintSizes(bool recurse = TRUE); + virtual void SetConstraintSizes(bool recurse = true); virtual bool DoPhase(int nPhase); #endif diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index 01e861258a..883ffae275 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -64,14 +64,14 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxNOTEBOOK_NAME); + const wxString& name = wxNotebookNameStr); // Create() function bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxNOTEBOOK_NAME); + const wxString& name = wxNotebookNameStr); virtual ~wxNotebook(); // accessors diff --git a/include/wx/notebook.h b/include/wx/notebook.h index 6dbfbe7d82..0ba429a919 100644 --- a/include/wx/notebook.h +++ b/include/wx/notebook.h @@ -41,7 +41,11 @@ enum typedef wxWindow wxNotebookPage; // so far, any window can be a page -#define wxNOTEBOOK_NAME _T("notebook") +WXDLLEXPORT_DATA(extern const wxChar*) wxNotebookNameStr; + +#if WXWIN_COMPATIBILITY_2_4 + #define wxNOTEBOOK_NAME wxNotebookNameStr +#endif // ---------------------------------------------------------------------------- // wxNotebookBase: define wxNotebook interface @@ -60,7 +64,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxNOTEBOOK_NAME) ; + const wxString& name = wxNotebookNameStr) ; // wxNotebook-specific additions to wxBookCtrlBase interface // --------------------------------------------------------- diff --git a/include/wx/os2/notebook.h b/include/wx/os2/notebook.h index 36b8d1fe88..30a3a81031 100644 --- a/include/wx/os2/notebook.h +++ b/include/wx/os2/notebook.h @@ -41,7 +41,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = 0 - ,const wxString& rsName = "notebook" + ,const wxString& rsName = wxNotebookNameStr ); bool Create( wxWindow* pParent @@ -49,7 +49,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = 0 - ,const wxString& rsName = "notebook" + ,const wxString& rsName = wxNotebookNameStr ); // @@ -127,7 +127,7 @@ public: // bool AddPage( wxNotebookPage* pPage ,const wxString& rsStrText - ,bool bSelect = FALSE + ,bool bSelect = false ,int nImageId = -1 ); @@ -137,7 +137,7 @@ public: bool InsertPage( size_t nPage ,wxNotebookPage* pPage ,const wxString& rsStrText - ,bool bSelect = FALSE + ,bool bSelect = false ,int nImageId = -1 ); @@ -165,7 +165,7 @@ public: ,WXWORD wPos ,WXHWND hControl ); - virtual void SetConstraintSizes(bool bRecurse = TRUE); + virtual void SetConstraintSizes(bool bRecurse = true); virtual bool DoPhase(int nPhase); protected: diff --git a/include/wx/palmos/notebook.h b/include/wx/palmos/notebook.h index ccdc06f094..fd9333b16c 100644 --- a/include/wx/palmos/notebook.h +++ b/include/wx/palmos/notebook.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// // Name: palmos/notebook.h -// Purpose: MSW/GTK compatible notebook (a.k.a. property sheet) +// Purpose: notebook interface (a.k.a. property sheet) // Author: William Osborne // Modified by: // Created: 10/13/04 -// RCS-ID: $Id: +// RCS-ID: $Id: // Copyright: (c) William Osborne // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -34,7 +34,7 @@ public : wxNotebookPageInfo() { m_page = NULL ; m_imageId = -1 ; m_selected = false ; } virtual ~wxNotebookPageInfo() { } - void Create( wxNotebookPage *page , const wxString &text , bool selected , int imageId ) + void Create( wxNotebookPage *page , const wxString &text , bool selected , int imageId ) { m_page = page ; m_text = text ; m_selected = selected ; m_imageId = imageId ; } wxNotebookPage* GetPage() const { return m_page ; } wxString GetText() const { return m_text ; } @@ -55,140 +55,126 @@ WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList ); class WXDLLEXPORT wxNotebook : public wxNotebookBase { public: - // ctors - // ----- + // ctors + // ----- + // default for dynamic class - wxNotebook(); + wxNotebook(); + // the same arguments as for wxControl (@@@ any special styles?) - wxNotebook(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxNOTEBOOK_NAME); + wxNotebook(wxWindow *parent, + wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxNotebookNameStr); + // Create() function - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxNOTEBOOK_NAME); - - // accessors - // --------- + bool Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxNotebookNameStr); + + // accessors + // --------- + // get number of pages in the dialog - virtual size_t GetPageCount() const; + virtual size_t GetPageCount() const; // set the currently selected page, return the index of the previously // selected one (or -1 on error) // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events - int SetSelection(size_t nPage); + int SetSelection(size_t nPage); + // get the currently selected page - int GetSelection() const { return m_nSelection; } + int GetSelection() const { return m_nSelection; } // set/get the title of a page - bool SetPageText(size_t nPage, const wxString& strText); - wxString GetPageText(size_t nPage) const; - - // image list stuff: each page may have an image associated with it. All - // the images belong to an image list, so you have to - // 1) create an image list - // 2) associate it with the notebook - // 3) set for each page it's image + bool SetPageText(size_t nPage, const wxString& strText); + wxString GetPageText(size_t nPage) const; + + // image list stuff: each page may have an image associated with it. All + // the images belong to an image list, so you have to + // 1) create an image list + // 2) associate it with the notebook + // 3) set for each page it's image // associate image list with a control - void SetImageList(wxImageList* imageList); + void SetImageList(wxImageList* imageList); // sets/returns item's image index in the current image list - int GetPageImage(size_t nPage) const; - bool SetPageImage(size_t nPage, int nImage); + int GetPageImage(size_t nPage) const; + bool SetPageImage(size_t nPage, int nImage); // currently it's always 1 because wxGTK doesn't support multi-row // tab controls - int GetRowCount() const; + int GetRowCount() const; - // control the appearance of the notebook pages + // control the appearance of the notebook pages // set the size (the same for all pages) - void SetPageSize(const wxSize& size); + void SetPageSize(const wxSize& size); // set the padding between tabs (in pixels) - void SetPadding(const wxSize& padding); + void SetPadding(const wxSize& padding); - // Windows only: attempts to get colour for UX theme page background - wxColour GetThemeBackgroundColour(); - - // operations - // ---------- + // operations + // ---------- // remove all pages - bool DeleteAllPages(); + bool DeleteAllPages(); // inserts a new page to the notebook (it will be deleted ny the notebook, // don't delete it yourself). If bSelect, this page becomes active. - bool InsertPage(size_t nPage, - wxNotebookPage *pPage, - const wxString& strText, - bool bSelect = FALSE, - int imageId = -1); + bool InsertPage(size_t nPage, + wxNotebookPage *pPage, + const wxString& strText, + bool bSelect = false, + int imageId = -1); - void AddPageInfo( wxNotebookPageInfo* info ) { AddPage( info->GetPage() , info->GetText() , info->GetSelected() , info->GetImageId() ) ; } - const wxNotebookPageInfoList& GetPageInfos() const ; + void AddPageInfo( wxNotebookPageInfo* info ) { AddPage( info->GetPage() , info->GetText() , info->GetSelected() , info->GetImageId() ) ; } + const wxNotebookPageInfoList& GetPageInfos() const ; // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH // style. - void SetTabSize(const wxSize& sz); - - // Windows only: attempts to apply the UX theme page background to this page - void ApplyThemeBackground(wxWindow* window, const wxColour& colour); + void SetTabSize(const wxSize& sz); // hit test - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; + virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; // calculate the size of the notebook from the size of its page - virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; - - // callbacks - // --------- - void OnSize(wxSizeEvent& event); - void OnSelChange(wxNotebookEvent& event); - void OnNavigationKey(wxNavigationKeyEvent& event); + virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; - // base class virtuals - // ------------------- + // callbacks + // --------- + void OnSize(wxSizeEvent& event); + void OnSelChange(wxNotebookEvent& event); + void OnNavigationKey(wxNavigationKeyEvent& event); - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - virtual bool MSWOnScroll(int orientation, WXWORD nSBCode, - WXWORD pos, WXHWND control); - virtual bool MSWTranslateMessage(WXMSG *wxmsg); + // base class virtuals + // ------------------- #if wxUSE_CONSTRAINTS - virtual void SetConstraintSizes(bool recurse = TRUE); - virtual bool DoPhase(int nPhase); + virtual void SetConstraintSizes(bool recurse = true); + virtual bool DoPhase(int nPhase); #endif // wxUSE_CONSTRAINTS protected: - // common part of all ctors - void Init(); + // common part of all ctors + void Init(); - // translate wxWin styles to the Windows ones - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; + // remove one page from the notebook, without deleting + virtual wxNotebookPage *DoRemovePage(size_t nPage); - // remove one page from the notebook, without deleting - virtual wxNotebookPage *DoRemovePage(size_t nPage); - - // set the size of the given page to fit in the notebook - void AdjustPageSize(wxNotebookPage *page); - - // override WndProc. -#if wxUSE_UXTHEME - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); -#endif + // set the size of the given page to fit in the notebook + void AdjustPageSize(wxNotebookPage *page); - // the current selection (-1 if none) - int m_nSelection; + // the current selection (-1 if none) + int m_nSelection; - wxNotebookPageInfoList m_pageInfos ; + wxNotebookPageInfoList m_pageInfos ; - DECLARE_DYNAMIC_CLASS_NO_COPY(wxNotebook) - DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS_NO_COPY(wxNotebook) + DECLARE_EVENT_TABLE() }; #endif // wxUSE_NOTEBOOK diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h index c3639ea1af..4ef1065d3e 100644 --- a/include/wx/univ/notebook.h +++ b/include/wx/univ/notebook.h @@ -46,7 +46,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxNOTEBOOK_NAME) + const wxString& name = wxNotebookNameStr) { Init(); @@ -59,7 +59,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxNOTEBOOK_NAME); + const wxString& name = wxNotebookNameStr); // dtor virtual ~wxNotebook(); diff --git a/src/common/datacmn.cpp b/src/common/datacmn.cpp index 8be0c34050..a1155538ed 100644 --- a/src/common/datacmn.cpp +++ b/src/common/datacmn.cpp @@ -110,6 +110,7 @@ wxColour wxNullColour; // Default window names WXDLLEXPORT_DATA(const wxChar *) wxControlNameStr = wxT("control"); WXDLLEXPORT_DATA(const wxChar *) wxButtonNameStr = wxT("button"); +WXDLLEXPORT_DATA(const wxChar *) wxButtonBarNameStr = wxT("buttonbar"); WXDLLEXPORT_DATA(const wxChar *) wxCanvasNameStr = wxT("canvas"); WXDLLEXPORT_DATA(const wxChar *) wxCheckBoxNameStr = wxT("check"); WXDLLEXPORT_DATA(const wxChar *) wxChoiceNameStr = wxT("choice"); @@ -122,6 +123,7 @@ WXDLLEXPORT_DATA(const wxChar *) wxListBoxNameStr = wxT("listBox"); WXDLLEXPORT_DATA(const wxChar *) wxStaticTextNameStr = wxT("message"); WXDLLEXPORT_DATA(const wxChar *) wxStaticBitmapNameStr = wxT("message"); WXDLLEXPORT_DATA(const wxChar *) wxMultiTextNameStr = wxT("multitext"); +WXDLLEXPORT_DATA(const wxChar *) wxNotebookNameStr = wxT("notebook"); WXDLLEXPORT_DATA(const wxChar *) wxPanelNameStr = wxT("panel"); WXDLLEXPORT_DATA(const wxChar *) wxRadioBoxNameStr = wxT("radioBox"); WXDLLEXPORT_DATA(const wxChar *) wxRadioButtonNameStr = wxT("radioButton"); @@ -129,17 +131,21 @@ WXDLLEXPORT_DATA(const wxChar *) wxBitmapRadioButtonNameStr = wxT("radioButton") WXDLLEXPORT_DATA(const wxChar *) wxScrollBarNameStr = wxT("scrollBar"); WXDLLEXPORT_DATA(const wxChar *) wxSliderNameStr = wxT("slider"); WXDLLEXPORT_DATA(const wxChar *) wxStaticNameStr = wxT("static"); +WXDLLEXPORT_DATA(const wxChar *) wxStatusLineNameStr = wxT("status_line"); WXDLLEXPORT_DATA(const wxChar *) wxTextCtrlWindowNameStr = wxT("textWindow"); WXDLLEXPORT_DATA(const wxChar *) wxTextCtrlNameStr = wxT("text"); -WXDLLEXPORT_DATA(const wxChar *) wxVirtListBoxNameStr = wxT("virtListBox"); -WXDLLEXPORT_DATA(const wxChar *) wxButtonBarNameStr = wxT("buttonbar"); +WXDLLEXPORT_DATA(const wxChar *) wxTreeCtrlNameStr = wxT("treeCtrl"); WXDLLEXPORT_DATA(const wxChar *) wxEnhDialogNameStr = wxT("Shell"); WXDLLEXPORT_DATA(const wxChar *) wxToolBarNameStr = wxT("toolbar"); -WXDLLEXPORT_DATA(const wxChar *) wxStatusLineNameStr = wxT("status_line"); +WXDLLEXPORT_DATA(const wxChar *) wxVirtListBoxNameStr = wxT("virtListBox"); + +// Default messages WXDLLEXPORT_DATA(const wxChar *) wxGetTextFromUserPromptStr = wxT("Input Text"); WXDLLEXPORT_DATA(const wxChar *) wxGetPasswordFromUserPromptStr = wxT("Enter Password"); WXDLLEXPORT_DATA(const wxChar *) wxMessageBoxCaptionStr = wxT("Message"); WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorPromptStr = wxT("Select a file"); + +// Other default strings WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorDefaultWildcardStr = #if defined(__WXMSW__) || defined(__WXOS2__) wxT("*.*") @@ -147,7 +153,6 @@ WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorDefaultWildcardStr = wxT("*") #endif ; -WXDLLEXPORT_DATA(const wxChar *) wxTreeCtrlNameStr = wxT("treeCtrl"); WXDLLEXPORT_DATA(const wxChar *) wxDirDialogNameStr = wxT("wxDirCtrl"); WXDLLEXPORT_DATA(const wxChar *) wxDirDialogDefaultFolderStr = wxT("/"); diff --git a/src/palmos/notebook.cpp b/src/palmos/notebook.cpp index 328b7fcd76..d62f9c9f8e 100644 --- a/src/palmos/notebook.cpp +++ b/src/palmos/notebook.cpp @@ -27,32 +27,6 @@ #include "wx/string.h" #endif // WX_PRECOMP -#include "wx/log.h" -#include "wx/imaglist.h" -#include "wx/event.h" -#include "wx/control.h" -#include "wx/notebook.h" -#include "wx/app.h" - -#include "wx/palmos/private.h" - -#include "wx/palmos/winundef.h" - -#if wxUSE_UXTHEME -#include "wx/palmos/uxtheme.h" - -#include "wx/radiobut.h" -#include "wx/radiobox.h" -#include "wx/checkbox.h" -#include "wx/bmpbuttn.h" -#include "wx/statline.h" -#include "wx/statbox.h" -#include "wx/stattext.h" -#include "wx/slider.h" -#include "wx/scrolwin.h" -#include "wx/panel.h" -#endif - // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- @@ -60,26 +34,6 @@ // check that the page index is valid #define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount()) -// hide the ugly cast -#define m_hwnd (HWND)GetHWND() - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// This is a work-around for missing defines in gcc-2.95 headers -#ifndef TCS_RIGHT - #define TCS_RIGHT 0x0002 -#endif - -#ifndef TCS_VERTICAL - #define TCS_VERTICAL 0x0080 -#endif - -#ifndef TCS_BOTTOM - #define TCS_BOTTOM TCS_RIGHT -#endif - // ---------------------------------------------------------------------------- // event table // ---------------------------------------------------------------------------- @@ -225,23 +179,18 @@ bool wxNotebook::Create(wxWindow *parent, return false; } -WXDWORD wxNotebook::MSWGetStyle(long style, WXDWORD *exstyle) const -{ - return 0; -} - // ---------------------------------------------------------------------------- // wxNotebook accessors // ---------------------------------------------------------------------------- size_t wxNotebook::GetPageCount() const { - return 0; + return 0; } int wxNotebook::GetRowCount() const { - return 0; + return 0; } int wxNotebook::SetSelection(size_t nPage) @@ -256,14 +205,12 @@ bool wxNotebook::SetPageText(size_t nPage, const wxString& strText) wxString wxNotebook::GetPageText(size_t nPage) const { - wxString str; - - return str; + return wxEmptyString; } int wxNotebook::GetPageImage(size_t nPage) const { - return -1; + return -1; } bool wxNotebook::SetPageImage(size_t nPage, int nImage) @@ -313,7 +260,7 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage) // remove all pages bool wxNotebook::DeleteAllPages() { - return true; + return true; } // same as AddPage() but does it at given position @@ -344,11 +291,6 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event) { } -bool wxNotebook::MSWTranslateMessage(WXMSG *wxmsg) -{ - return false; -} - void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) { } @@ -372,41 +314,4 @@ bool wxNotebook::DoPhase(int WXUNUSED(nPhase)) #endif // wxUSE_CONSTRAINTS -// ---------------------------------------------------------------------------- -// wxNotebook Windows message handlers -// ---------------------------------------------------------------------------- - -bool wxNotebook::MSWOnScroll(int orientation, WXWORD nSBCode, - WXWORD pos, WXHWND control) -{ - return false; -} - -bool wxNotebook::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result) -{ - return false; -} - -// Windows only: attempts to get colour for UX theme page background -wxColour wxNotebook::GetThemeBackgroundColour() -{ - return wxColour; -} - -// Windows only: attempts to apply the UX theme page background to this page -#if wxUSE_UXTHEME -void wxNotebook::ApplyThemeBackground(wxWindow* window, const wxColour& colour) -#else -void wxNotebook::ApplyThemeBackground(wxWindow*, const wxColour&) -#endif -{ -} - -#if wxUSE_UXTHEME -WXLRESULT wxNotebook::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) -{ - return 0; -} -#endif // #if wxUSE_UXTHEME - #endif // wxUSE_NOTEBOOK