removed WXWIN_COMPATIBILITY and WXWIN_COMPATIBILITY_2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -855,37 +855,6 @@ void wxWindowMGL::WarpPointer(int x, int y)
|
||||
EVT_setMousePos(x, y);
|
||||
}
|
||||
|
||||
#if WXWIN_COMPATIBILITY
|
||||
// If nothing defined for this, try the parent.
|
||||
// E.g. we may be a button loaded from a resource, with no callback function
|
||||
// defined.
|
||||
void wxWindowMGL::OnCommand(wxWindow& win, wxCommandEvent& event)
|
||||
{
|
||||
if ( GetEventHandler()->ProcessEvent(event) )
|
||||
return;
|
||||
if ( m_parent )
|
||||
m_parent->GetEventHandler()->OnCommand(win, event);
|
||||
}
|
||||
#endif // WXWIN_COMPATIBILITY_2
|
||||
|
||||
#if WXWIN_COMPATIBILITY
|
||||
wxObject* wxWindowMGL::GetChild(int number) const
|
||||
{
|
||||
// Return a pointer to the Nth object in the Panel
|
||||
wxNode *node = GetChildren().First();
|
||||
int n = number;
|
||||
while (node && n--)
|
||||
node = node->Next();
|
||||
if ( node )
|
||||
{
|
||||
wxObject *obj = (wxObject *)node->Data();
|
||||
return(obj);
|
||||
}
|
||||
else
|
||||
return NULL;
|
||||
}
|
||||
#endif // WXWIN_COMPATIBILITY
|
||||
|
||||
// Set this window to be the child of 'parent'.
|
||||
bool wxWindowMGL::Reparent(wxWindowBase *parent)
|
||||
{
|
||||
@@ -1103,48 +1072,6 @@ void wxWindowMGL::GetTextExtent(const wxString& string,
|
||||
dc.GetTextExtent(string, x, y, descent, externalLeading, (wxFont*)theFont);
|
||||
}
|
||||
|
||||
#if wxUSE_CARET && WXWIN_COMPATIBILITY
|
||||
// ---------------------------------------------------------------------------
|
||||
// Caret manipulation
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
void wxWindowMGL::CreateCaret(int w, int h)
|
||||
{
|
||||
SetCaret(new wxCaret(this, w, h));
|
||||
}
|
||||
|
||||
void wxWindowMGL::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
|
||||
{
|
||||
wxFAIL_MSG("not implemented");
|
||||
}
|
||||
|
||||
void wxWindowMGL::ShowCaret(bool show)
|
||||
{
|
||||
wxCHECK_RET( m_caret, "no caret to show" );
|
||||
|
||||
m_caret->Show(show);
|
||||
}
|
||||
|
||||
void wxWindowMGL::DestroyCaret()
|
||||
{
|
||||
SetCaret(NULL);
|
||||
}
|
||||
|
||||
void wxWindowMGL::SetCaretPos(int x, int y)
|
||||
{
|
||||
wxCHECK_RET( m_caret, "no caret to move" );
|
||||
|
||||
m_caret->Move(x, y);
|
||||
}
|
||||
|
||||
void wxWindowMGL::GetCaretPos(int *x, int *y) const
|
||||
{
|
||||
wxCHECK_RET( m_caret, "no caret to get position of" );
|
||||
|
||||
m_caret->GetPosition(x, y);
|
||||
}
|
||||
#endif // wxUSE_CARET
|
||||
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// painting
|
||||
|
Reference in New Issue
Block a user