From fc0daf84009784af053fa265d8ad8e9e446388f4 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 7 Jul 2001 14:43:10 +0000 Subject: [PATCH] corrected log error after initialize when in release mode, window inheritance (generated incorrect classinfo trees) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/app.cpp | 2 ++ src/mac/carbon/app.cpp | 2 ++ src/mac/carbon/notebmac.cpp | 22 +++++++++------------- src/mac/carbon/window.cpp | 10 ++++++++-- src/mac/notebmac.cpp | 22 +++++++++------------- src/mac/window.cpp | 10 ++++++++-- 6 files changed, 38 insertions(+), 30 deletions(-) diff --git a/src/mac/app.cpp b/src/mac/app.cpp index d03b4244fd..4e4699db1d 100644 --- a/src/mac/app.cpp +++ b/src/mac/app.cpp @@ -459,6 +459,7 @@ bool wxApp::Initialize() wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); wxTheColourDatabase->Initialize(); +#ifdef __WXDEBUG__ #if wxUSE_LOG // flush the logged messages if any and install a 'safer' log target: the // default one (wxLogGui) can't be used after the resources are freed just @@ -469,6 +470,7 @@ bool wxApp::Initialize() // this will flush the old messages if any delete wxLog::SetActiveTarget(new wxLogStderr); #endif // wxUSE_LOG +#endif wxInitializeStockLists(); wxInitializeStockObjects(); diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index d03b4244fd..4e4699db1d 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -459,6 +459,7 @@ bool wxApp::Initialize() wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); wxTheColourDatabase->Initialize(); +#ifdef __WXDEBUG__ #if wxUSE_LOG // flush the logged messages if any and install a 'safer' log target: the // default one (wxLogGui) can't be used after the resources are freed just @@ -469,6 +470,7 @@ bool wxApp::Initialize() // this will flush the old messages if any delete wxLog::SetActiveTarget(new wxLogStderr); #endif // wxUSE_LOG +#endif wxInitializeStockLists(); wxInitializeStockObjects(); diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp index 6e94d28049..9d0b2c4593 100644 --- a/src/mac/carbon/notebmac.cpp +++ b/src/mac/carbon/notebmac.cpp @@ -134,14 +134,17 @@ wxNotebook::~wxNotebook() void wxNotebook::SetPadding(const wxSize& padding) { + wxFAIL_MSG( wxT("wxNotebook::SetPadding not implemented") ); } void wxNotebook::SetTabSize(const wxSize& sz) { + wxFAIL_MSG( wxT("wxNotebook::SetTabSize not implemented") ); } void wxNotebook::SetPageSize(const wxSize& size) { + wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") ); } int wxNotebook::SetSelection(int nPage) @@ -175,17 +178,18 @@ wxString wxNotebook::GetPageText(int nPage) const int wxNotebook::GetPageImage(int nPage) const { - wxASSERT( IS_VALID_PAGE(nPage) ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") ); - // TODO - return 0; + return 0 ; } bool wxNotebook::SetPageImage(int nPage, int nImage) { - wxASSERT( IS_VALID_PAGE(nPage) ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("invalid notebook page") ); + + wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), FALSE, + _T("invalid image index in SetPageImage()") ); - // TODO return FALSE; } @@ -305,14 +309,6 @@ void wxNotebook::MacSetupTabs() // time because doing it in ::Create() doesn't work (for unknown reasons) void wxNotebook::OnSize(wxSizeEvent& event) { - static bool s_bFirstTime = TRUE; - if ( s_bFirstTime ) { - // TODO: any first-time-size processing. - s_bFirstTime = FALSE; - } - - // TODO: all this may or may not be necessary for your platform - // emulate page change (it's esp. important to do it first time because // otherwise our page would stay invisible) int nSel = m_nSelection; diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 35f8c0ef6d..0cd659a9f0 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -56,9 +56,15 @@ extern wxList wxPendingDelete; wxWindowMac* gFocusWindow = NULL ; +#ifdef __WXUNIVERSAL__ + IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase) +#else // __WXMAC__ + IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase) +#endif // __WXUNIVERSAL__/__WXMAC__ + #if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxWindowMac, wxEvtHandler) -BEGIN_EVENT_TABLE(wxWindowMac, wxEvtHandler) + +BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase) EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground) EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged) EVT_INIT_DIALOG(wxWindowMac::OnInitDialog) diff --git a/src/mac/notebmac.cpp b/src/mac/notebmac.cpp index 6e94d28049..9d0b2c4593 100644 --- a/src/mac/notebmac.cpp +++ b/src/mac/notebmac.cpp @@ -134,14 +134,17 @@ wxNotebook::~wxNotebook() void wxNotebook::SetPadding(const wxSize& padding) { + wxFAIL_MSG( wxT("wxNotebook::SetPadding not implemented") ); } void wxNotebook::SetTabSize(const wxSize& sz) { + wxFAIL_MSG( wxT("wxNotebook::SetTabSize not implemented") ); } void wxNotebook::SetPageSize(const wxSize& size) { + wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") ); } int wxNotebook::SetSelection(int nPage) @@ -175,17 +178,18 @@ wxString wxNotebook::GetPageText(int nPage) const int wxNotebook::GetPageImage(int nPage) const { - wxASSERT( IS_VALID_PAGE(nPage) ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") ); - // TODO - return 0; + return 0 ; } bool wxNotebook::SetPageImage(int nPage, int nImage) { - wxASSERT( IS_VALID_PAGE(nPage) ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("invalid notebook page") ); + + wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), FALSE, + _T("invalid image index in SetPageImage()") ); - // TODO return FALSE; } @@ -305,14 +309,6 @@ void wxNotebook::MacSetupTabs() // time because doing it in ::Create() doesn't work (for unknown reasons) void wxNotebook::OnSize(wxSizeEvent& event) { - static bool s_bFirstTime = TRUE; - if ( s_bFirstTime ) { - // TODO: any first-time-size processing. - s_bFirstTime = FALSE; - } - - // TODO: all this may or may not be necessary for your platform - // emulate page change (it's esp. important to do it first time because // otherwise our page would stay invisible) int nSel = m_nSelection; diff --git a/src/mac/window.cpp b/src/mac/window.cpp index 35f8c0ef6d..0cd659a9f0 100644 --- a/src/mac/window.cpp +++ b/src/mac/window.cpp @@ -56,9 +56,15 @@ extern wxList wxPendingDelete; wxWindowMac* gFocusWindow = NULL ; +#ifdef __WXUNIVERSAL__ + IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase) +#else // __WXMAC__ + IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase) +#endif // __WXUNIVERSAL__/__WXMAC__ + #if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxWindowMac, wxEvtHandler) -BEGIN_EVENT_TABLE(wxWindowMac, wxEvtHandler) + +BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase) EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground) EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged) EVT_INIT_DIALOG(wxWindowMac::OnInitDialog) -- 2.47.2