Get wxSearchCtrl text events working, and share the text event handler code among...

[wxWidgets.git] / src / osx / toplevel_osx.cpp

diff --git a/src/osx/toplevel_osx.cpp b/src/osx/toplevel_osx.cpp
index cd91ccb82b91aeb9d0679032f564a845e594151c..8abcfbab435bc4773589a7513f9464cadd23c7b2 100644 (file)
--- a/src/osx/toplevel_osx.cpp
+++ b/src/osx/toplevel_osx.cpp
@@ -159,7 +159,9 @@ wxString wxTopLevelWindowMac::GetTitle() const
 
 void wxTopLevelWindowMac::ShowWithoutActivating()
 {
 
 void wxTopLevelWindowMac::ShowWithoutActivating()
 {

-    if ( !wxTopLevelWindowBase::Show(true) )
+    // wxTopLevelWindowBase is derived from wxNonOwnedWindow, so don't
+    // call it here.
+    if ( !wxWindow::Show(true) )

         return;
 
     m_nowpeer->ShowWithoutActivating();
         return;
 
     m_nowpeer->ShowWithoutActivating();


@@ -187,12 +189,12 @@ bool wxTopLevelWindowMac::IsActive()
     return m_nowpeer->IsActive();
 }
 
     return m_nowpeer->IsActive();
 }
 

-void wxTopLevelWindowMac::SetModified(bool modified)
+void wxTopLevelWindowMac::OSXSetModified(bool modified)

 {
     m_nowpeer->SetModified(modified);
 }
 
 {
     m_nowpeer->SetModified(modified);
 }
 

-bool wxTopLevelWindowMac::GetModified() const
+bool wxTopLevelWindowMac::OSXIsModified() const

 {
 {

-    return m_nowpeer->GetModified();
-}
\ No newline at end of file
+    return m_nowpeer->IsModified();
+}