diff --git a/debian/changelog b/debian/changelog index 63d41aa83b..20a8a0bb0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +wxwidgets2.8 (2.8.0.1-0) unstable; urgency=low + + * Add wxSearchCtrl + * Official wxPython release + + -- Robin Dunn Mon, 11 Dec 2006 18:50:29 -0800 + wxwidgets2.8 (2.8.0.0-0rc3) unstable; urgency=low * wxFileSystem::OpenFile() takes wxFS_SEEKABLE by default now. diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h index 4053598903..9acf4d42b9 100644 --- a/include/wx/mac/carbon/colour.h +++ b/include/wx/mac/carbon/colour.h @@ -31,7 +31,7 @@ public: // accessors bool Ok() const { return IsOk(); } - bool IsOk() const {return m_isInit; } + bool IsOk() const; unsigned char Red() const { return m_red; } unsigned char Green() const { return m_green; } diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h index 63c90a0961..b8b954ecca 100644 --- a/include/wx/wfstream.h +++ b/include/wx/wfstream.h @@ -39,7 +39,7 @@ public: wxFileOffset GetLength() const; bool Ok() const { return IsOk(); } - virtual bool IsOk() const { return (wxStreamBase::IsOk() && m_file->IsOpened()); } + virtual bool IsOk() const; bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; } protected: @@ -69,7 +69,7 @@ public: wxFileOffset GetLength() const; bool Ok() const { return IsOk(); } - virtual bool IsOk() const { return (wxStreamBase::IsOk() && m_file->IsOpened()); } + virtual bool IsOk() const; bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; } protected: @@ -140,7 +140,7 @@ public: wxFileOffset GetLength() const; bool Ok() const { return IsOk(); } - virtual bool IsOk() const { return (wxStreamBase::IsOk() && m_file->IsOpened()); } + virtual bool IsOk() const; bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; } protected: @@ -170,7 +170,7 @@ public: wxFileOffset GetLength() const; bool Ok() const { return IsOk(); } - virtual bool IsOk() const { return (wxStreamBase::IsOk() && m_file->IsOpened()); } + virtual bool IsOk() const ; bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; } protected: diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp index 572d2be6d5..25327f1489 100644 --- a/src/common/wfstream.cpp +++ b/src/common/wfstream.cpp @@ -107,6 +107,11 @@ wxFileOffset wxFileInputStream::OnSysTell() const return m_file->Tell(); } +bool wxFileInputStream::IsOk() const +{ + return (wxStreamBase::IsOk() && m_file->IsOpened()); +} + // ---------------------------------------------------------------------------- // wxFileOutputStream // ---------------------------------------------------------------------------- @@ -178,6 +183,11 @@ wxFileOffset wxFileOutputStream::GetLength() const return m_file->Length(); } +bool wxFileOutputStream::IsOk() const +{ + return (wxStreamBase::IsOk() && m_file->IsOpened()); +} + // ---------------------------------------------------------------------------- // wxTempFileOutputStream // ---------------------------------------------------------------------------- @@ -290,6 +300,11 @@ wxFileOffset wxFFileInputStream::OnSysTell() const return m_file->Tell(); } +bool wxFFileInputStream::IsOk() const +{ + return (wxStreamBase::IsOk() && m_file->IsOpened()); +} + // ---------------------------------------------------------------------------- // wxFFileOutputStream // ---------------------------------------------------------------------------- @@ -371,6 +386,11 @@ wxFileOffset wxFFileOutputStream::GetLength() const return m_file->Length(); } +bool wxFFileOutputStream::IsOk() const +{ + return (wxStreamBase::IsOk() && m_file->IsOpened()); +} + // ---------------------------------------------------------------------------- // wxFFileStream // ---------------------------------------------------------------------------- diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp index 2572be337b..6a3562c3d4 100644 --- a/src/mac/carbon/colour.cpp +++ b/src/mac/carbon/colour.cpp @@ -63,3 +63,9 @@ void wxColour::FromRGBColor( WXCOLORREF* color ) m_blue = col->blue >> 8; m_green = col->green >> 8; } + +bool wxColour::IsOk() const +{ + return m_isInit; +} +