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

1) minor modifications in fileconf.cpp

Browse Source 
2) new MSW function (private.h): wxGetWindowText() which works with wxString
   instead of (horror) fixed size buffers. All calls to ::GetWindowText()
   should be replaced with this!
3) remains of casts to float in different wxControl classes removed,
   (EDIT|BUTTON)_HEIGHT_FROM_CHAR_HEIGHT macros introduced (could be
   made inline functions as well...)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-09-20 21:13:46 +00:00
parent 803bf1c581
commit 1c4a764c98
11 changed files with 111 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/msw/notebook.cpp
View File

@@ -198,7 +198,7 @@ int wxNotebook::GetRowCount() const
int wxNotebook::SetSelection(int nPage)
{
wxASSERT( IS_VALID_PAGE(nPage) );
wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, "notebook page out of range" );
ChangePage(m_nSelection, nPage);
@@ -217,7 +217,7 @@ void wxNotebook::AdvanceSelection(bool bForward)
bool wxNotebook::SetPageText(int nPage, const wxString& strText)
{
wxASSERT( IS_VALID_PAGE(nPage) );
wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, "notebook page out of range" );
TC_ITEM tcItem;
tcItem.mask = TCIF_TEXT;
@@ -228,7 +228,7 @@ bool wxNotebook::SetPageText(int nPage, const wxString& strText)
wxString wxNotebook::GetPageText(int nPage) const
{
wxASSERT( IS_VALID_PAGE(nPage) );
wxCHECK_MSG( IS_VALID_PAGE(nPage), "", "notebook page out of range" );
char buf[256];
TC_ITEM tcItem;
@@ -245,7 +245,7 @@ wxString wxNotebook::GetPageText(int nPage) const
int wxNotebook::GetPageImage(int nPage) const
{
wxASSERT( IS_VALID_PAGE(nPage) );
wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, "notebook page out of range" );
TC_ITEM tcItem;
tcItem.mask = TCIF_IMAGE;
@@ -255,7 +255,7 @@ int wxNotebook::GetPageImage(int nPage) const
bool wxNotebook::SetPageImage(int nPage, int nImage)
{
wxASSERT( IS_VALID_PAGE(nPage) );
wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, "notebook page out of range" );
TC_ITEM tcItem;
tcItem.mask = TCIF_IMAGE;
@@ -277,7 +277,7 @@ void wxNotebook::SetImageList(wxImageList* imageList)
// remove one page from the notebook
bool wxNotebook::DeletePage(int nPage)
{
wxCHECK( IS_VALID_PAGE(nPage), FALSE );
wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, "notebook page out of range" );
TabCtrl_DeleteItem(m_hwnd, nPage);