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

wxWindow::ReParent()

Browse Source 
wxDC::SetClippingRegio( region)
  lots if wxDC inline with wxPoint


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-12-03 15:14:45 +00:00
parent 1cff61deed
commit 463c1fa1a9
19 changed files with 640 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/postscrp.cpp
View File

@@ -304,6 +304,10 @@ void wxPostScriptDC::SetClippingRegion (long cx, long cy, long cw, long ch)
*m_pstream << "closepath clip newpath\n";
}
void wxPostScriptDC::SetClippingRegion( const wxRegion &WXUNUSED(region) )
{
}
void wxPostScriptDC::DestroyClippingRegion ()
{
if (!m_pstream)
@@ -319,7 +323,7 @@ void wxPostScriptDC::Clear ()
{
}
void wxPostScriptDC::FloodFill (long WXUNUSED(x), long WXUNUSED(y), wxColour * WXUNUSED(col), int WXUNUSED(style))
void wxPostScriptDC::FloodFill (long WXUNUSED(x), long WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style))
{
}
@@ -685,6 +689,10 @@ void wxPostScriptDC::DrawIcon (const wxIcon& icon, long x, long y)
#endif
}
void wxPostScriptDC::DrawBitmap( const wxBitmap& bitmap, long x, long y, bool useMask )
{
}
void wxPostScriptDC::SetFont (const wxFont& the_font)
{
if (!m_pstream)

3
src/generic/imaglist.cpp
View File

@@ -113,8 +113,7 @@ bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
if (!node) return FALSE;
wxBitmap *bm = (wxBitmap*)node->Data();
wxIcon *icon = (wxIcon*)bm;
dc.DrawIcon( *icon, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
return TRUE;
}

4
src/gtk.inc
View File

@@ -2,9 +2,9 @@
NONE =
# define library name
LIB_TARGET=wx_gtk
LIB_TARGET=wx_gtk_1_0
LIB_MAJOR=1
LIB_MINOR=97
LIB_MINOR=99
# define library sources

4
src/gtk/dc.cpp
View File

@@ -93,10 +93,6 @@ void wxDC::DrawArc( long WXUNUSED(x1), long WXUNUSED(y1), long WXUNUSED(x2), lon
{
}
void wxDC::DrawIcon( const wxIcon &WXUNUSED(icon), long WXUNUSED(x), long WXUNUSED(y), bool WXUNUSED(useMask) )
{
}
void wxDC::DrawPoint( wxPoint& point )
{
DrawPoint( point.x, point.y );

68
src/gtk/dcclient.cpp
View File

@@ -116,15 +116,6 @@ wxWindowDC::wxWindowDC( wxWindow *window )
SetUpDC();
/*
wxRegion update = window->GetUpdateRegion();
if (update.Empty()) return;
gdk_gc_set_clip_region( m_penGC, update.GetRegion() );
gdk_gc_set_clip_region( m_brushGC, update.GetRegion() );
gdk_gc_set_clip_region( m_textGC, update.GetRegion() );
gdk_gc_set_clip_region( m_bgGC, update.GetRegion() );
*/
}
wxWindowDC::~wxWindowDC(void)
@@ -132,8 +123,8 @@ wxWindowDC::~wxWindowDC(void)
Destroy();
}
void wxWindowDC::FloodFill( long WXUNUSED(x1), long WXUNUSED(y1),
wxColour *WXUNUSED(col), int WXUNUSED(style) )
void wxWindowDC::FloodFill( long WXUNUSED(x), long WXUNUSED(y),
const wxColour &WXUNUSED(col), int WXUNUSED(style) )
{
wxFAIL_MSG( "wxWindowDC::FloodFill not implemented" );
}
@@ -505,7 +496,7 @@ bool wxWindowDC::CanDrawBitmap(void) const
return TRUE;
}
void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y )
{
if (!Ok()) return;
@@ -517,7 +508,7 @@ void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
GdkBitmap *mask = (GdkBitmap *) NULL;
if (icon.GetMask()) mask = icon.GetMask()->GetBitmap();
if (useMask && mask)
if (mask)
{
gdk_gc_set_clip_mask( m_penGC, mask );
gdk_gc_set_clip_origin( m_penGC, xx, yy );
@@ -526,6 +517,39 @@ void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
GdkPixmap *pm = icon.GetPixmap();
gdk_draw_pixmap( m_window, m_penGC, pm, 0, 0, xx, yy, -1, -1 );
if (mask)
{
gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL );
gdk_gc_set_clip_origin( m_penGC, 0, 0 );
}
CalcBoundingBox( x, y );
int width = icon.GetWidth();
int height = icon.GetHeight();
CalcBoundingBox( x + width, y + height );
}
void wxWindowDC::DrawBitmap( const wxBitmap &bitmap, long x, long y, bool useMask )
{
if (!Ok()) return;
if (!bitmap.Ok()) return;
int xx = XLOG2DEV(x);
int yy = YLOG2DEV(y);
GdkBitmap *mask = (GdkBitmap *) NULL;
if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap();
if (useMask && mask)
{
gdk_gc_set_clip_mask( m_penGC, mask );
gdk_gc_set_clip_origin( m_penGC, xx, yy );
}
GdkPixmap *pm = bitmap.GetPixmap();
gdk_draw_pixmap( m_window, m_penGC, pm, 0, 0, xx, yy, -1, -1 );
if (useMask && mask)
{
gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL );
@@ -533,8 +557,8 @@ void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
}
CalcBoundingBox( x, y );
int width = icon.GetWidth();
int height = icon.GetHeight();
int width = bitmap.GetWidth();
int height = bitmap.GetHeight();
CalcBoundingBox( x + width, y + height );
}
@@ -941,6 +965,20 @@ void wxWindowDC::SetClippingRegion( long x, long y, long width, long height )
gdk_gc_set_clip_rectangle( m_bgGC, &rect );
}
void wxWindowDC::SetClippingRegion( const wxRegion &region )
{
if (region.Empty())
{
DestroyClippingRegion();
return;
}
gdk_gc_set_clip_region( m_penGC, region.GetRegion() );
gdk_gc_set_clip_region( m_brushGC, region.GetRegion() );
gdk_gc_set_clip_region( m_textGC, region.GetRegion() );
gdk_gc_set_clip_region( m_bgGC, region.GetRegion() );
}
void wxWindowDC::DestroyClippingRegion(void)
{
wxDC::DestroyClippingRegion();

2
src/gtk/win_gtk.c
View File

@@ -211,7 +211,7 @@ gtk_myfixed_move (GtkMyFixed *myfixed,
if (child->widget == widget)
{
/* if ((child->x == x) && (child->y == y)) return; */
if ((child->x == x) && (child->y == y)) return;
child->x = x;
child->y = y;

141
src/gtk/window.cpp
View File

@@ -1729,38 +1729,38 @@ int wxWindow::GetCharHeight() const
int wxWindow::GetCharWidth() const
{
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
if (!m_font.Ok())
{
wxFAIL_MSG( "invalid font" );
return -1;
}
if (!m_font.Ok())
{
wxFAIL_MSG( "invalid font" );
return -1;
}
GdkFont *font = m_font.GetInternalFont( 1.0 );
return gdk_string_width( font, "H" );
GdkFont *font = m_font.GetInternalFont( 1.0 );
return gdk_string_width( font, "H" );
}
void wxWindow::GetTextExtent( const wxString& string, int *x, int *y,
int *descent, int *externalLeading, const wxFont *theFont, bool WXUNUSED(use16) ) const
{
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
wxFont fontToUse = m_font;
if (theFont) fontToUse = *theFont;
wxFont fontToUse = m_font;
if (theFont) fontToUse = *theFont;
if (!fontToUse.Ok())
{
wxFAIL_MSG( "invalid font" );
return;
}
wxASSERT_MSG( (m_font.Ok()), "invalid font" );
if (!fontToUse.Ok())
{
wxFAIL_MSG( "invalid font" );
return;
}
wxASSERT_MSG( (m_font.Ok()), "invalid font" );
GdkFont *font = fontToUse.GetInternalFont( 1.0 );
if (x) (*x) = gdk_string_width( font, string );
if (y) (*y) = font->ascent + font->descent;
if (descent) (*descent) = font->descent;
if (externalLeading) (*externalLeading) = 0; // ??
GdkFont *font = fontToUse.GetInternalFont( 1.0 );
if (x) (*x) = gdk_string_width( font, string );
if (y) (*y) = font->ascent + font->descent;
if (descent) (*descent) = font->descent;
if (externalLeading) (*externalLeading) = 0; // ??
}
void wxWindow::MakeModal( bool modal )
@@ -1783,105 +1783,122 @@ void wxWindow::MakeModal( bool modal )
void wxWindow::SetFocus()
{
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
GtkWidget *connect_widget = GetConnectWidget();
if (connect_widget)
{
if (GTK_WIDGET_CAN_FOCUS(connect_widget) && !GTK_WIDGET_HAS_FOCUS (connect_widget) )
GtkWidget *connect_widget = GetConnectWidget();
if (connect_widget)
{
gtk_widget_grab_focus (connect_widget);
if (GTK_WIDGET_CAN_FOCUS(connect_widget) && !GTK_WIDGET_HAS_FOCUS (connect_widget) )
{
gtk_widget_grab_focus (connect_widget);
}
}
}
}
bool wxWindow::OnClose()
{
return TRUE;
return TRUE;
}
void wxWindow::AddChild( wxWindow *child )
{
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
wxASSERT_MSG( (child != NULL), "invalid child" );
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
wxASSERT_MSG( (child != NULL), "invalid child" );
m_children.Append( child );
m_children.Append( child );
}
wxList *wxWindow::GetChildren()
{
return (&m_children);
return (&m_children);
}
wxWindow *wxWindow::ReParent( wxWindow *newParent )
{
wxWindow *oldParent = GetParent();
if (oldParent) oldParent->RemoveChild( this );
gtk_widget_unparent( m_widget );
if (newParent)
{
newParent->AddChild( this );
(newParent->m_insertCallback)( newParent, this );
}
return oldParent;
}
void wxWindow::RemoveChild( wxWindow *child )
{
if (GetChildren()) GetChildren()->DeleteObject( child );
child->m_parent = (wxWindow *) NULL;
if (GetChildren()) GetChildren()->DeleteObject( child );
child->m_parent = (wxWindow *) NULL;
}
void wxWindow::SetReturnCode( int retCode )
{
m_retCode = retCode;
m_retCode = retCode;
}
int wxWindow::GetReturnCode()
{
return m_retCode;
return m_retCode;
}
void wxWindow::Raise()
{
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
if (m_widget) gdk_window_raise( m_widget->window );
if (m_widget) gdk_window_raise( m_widget->window );
}
void wxWindow::Lower()
{
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
if (m_widget) gdk_window_lower( m_widget->window );
if (m_widget) gdk_window_lower( m_widget->window );
}
wxEvtHandler *wxWindow::GetEventHandler()
{
return m_eventHandler;
return m_eventHandler;
}
void wxWindow::SetEventHandler( wxEvtHandler *handler )
{
m_eventHandler = handler;
m_eventHandler = handler;
}
void wxWindow::PushEventHandler(wxEvtHandler *handler)
{
handler->SetNextHandler(GetEventHandler());
SetEventHandler(handler);
handler->SetNextHandler(GetEventHandler());
SetEventHandler(handler);
}
wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler)
{
if (GetEventHandler())
{
wxEvtHandler *handlerA = GetEventHandler();
wxEvtHandler *handlerB = handlerA->GetNextHandler();
handlerA->SetNextHandler((wxEvtHandler *) NULL);
SetEventHandler(handlerB);
if (deleteHandler)
if (GetEventHandler())
{
delete handlerA;
return (wxEvtHandler*) NULL;
}
else
return handlerA;
}
else
return (wxEvtHandler *) NULL;
wxEvtHandler *handlerA = GetEventHandler();
wxEvtHandler *handlerB = handlerA->GetNextHandler();
handlerA->SetNextHandler((wxEvtHandler *) NULL);
SetEventHandler(handlerB);
if (deleteHandler)
{
delete handlerA;
return (wxEvtHandler*) NULL;
}
else
return handlerA;
}
else
return (wxEvtHandler *) NULL;
}
wxValidator *wxWindow::GetValidator()
{
return m_windowValidator;
return m_windowValidator;
}
void wxWindow::SetValidator( const wxValidator& validator )

4
src/gtk1/dc.cpp
View File

@@ -93,10 +93,6 @@ void wxDC::DrawArc( long WXUNUSED(x1), long WXUNUSED(y1), long WXUNUSED(x2), lon
{
}
void wxDC::DrawIcon( const wxIcon &WXUNUSED(icon), long WXUNUSED(x), long WXUNUSED(y), bool WXUNUSED(useMask) )
{
}
void wxDC::DrawPoint( wxPoint& point )
{
DrawPoint( point.x, point.y );

68
src/gtk1/dcclient.cpp
View File

@@ -116,15 +116,6 @@ wxWindowDC::wxWindowDC( wxWindow *window )
SetUpDC();
/*
wxRegion update = window->GetUpdateRegion();
if (update.Empty()) return;
gdk_gc_set_clip_region( m_penGC, update.GetRegion() );
gdk_gc_set_clip_region( m_brushGC, update.GetRegion() );
gdk_gc_set_clip_region( m_textGC, update.GetRegion() );
gdk_gc_set_clip_region( m_bgGC, update.GetRegion() );
*/
}
wxWindowDC::~wxWindowDC(void)
@@ -132,8 +123,8 @@ wxWindowDC::~wxWindowDC(void)
Destroy();
}
void wxWindowDC::FloodFill( long WXUNUSED(x1), long WXUNUSED(y1),
wxColour *WXUNUSED(col), int WXUNUSED(style) )
void wxWindowDC::FloodFill( long WXUNUSED(x), long WXUNUSED(y),
const wxColour &WXUNUSED(col), int WXUNUSED(style) )
{
wxFAIL_MSG( "wxWindowDC::FloodFill not implemented" );
}
@@ -505,7 +496,7 @@ bool wxWindowDC::CanDrawBitmap(void) const
return TRUE;
}
void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y )
{
if (!Ok()) return;
@@ -517,7 +508,7 @@ void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
GdkBitmap *mask = (GdkBitmap *) NULL;
if (icon.GetMask()) mask = icon.GetMask()->GetBitmap();
if (useMask && mask)
if (mask)
{
gdk_gc_set_clip_mask( m_penGC, mask );
gdk_gc_set_clip_origin( m_penGC, xx, yy );
@@ -526,6 +517,39 @@ void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
GdkPixmap *pm = icon.GetPixmap();
gdk_draw_pixmap( m_window, m_penGC, pm, 0, 0, xx, yy, -1, -1 );
if (mask)
{
gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL );
gdk_gc_set_clip_origin( m_penGC, 0, 0 );
}
CalcBoundingBox( x, y );
int width = icon.GetWidth();
int height = icon.GetHeight();
CalcBoundingBox( x + width, y + height );
}
void wxWindowDC::DrawBitmap( const wxBitmap &bitmap, long x, long y, bool useMask )
{
if (!Ok()) return;
if (!bitmap.Ok()) return;
int xx = XLOG2DEV(x);
int yy = YLOG2DEV(y);
GdkBitmap *mask = (GdkBitmap *) NULL;
if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap();
if (useMask && mask)
{
gdk_gc_set_clip_mask( m_penGC, mask );
gdk_gc_set_clip_origin( m_penGC, xx, yy );
}
GdkPixmap *pm = bitmap.GetPixmap();
gdk_draw_pixmap( m_window, m_penGC, pm, 0, 0, xx, yy, -1, -1 );
if (useMask && mask)
{
gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL );
@@ -533,8 +557,8 @@ void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
}
CalcBoundingBox( x, y );
int width = icon.GetWidth();
int height = icon.GetHeight();
int width = bitmap.GetWidth();
int height = bitmap.GetHeight();
CalcBoundingBox( x + width, y + height );
}
@@ -941,6 +965,20 @@ void wxWindowDC::SetClippingRegion( long x, long y, long width, long height )
gdk_gc_set_clip_rectangle( m_bgGC, &rect );
}
void wxWindowDC::SetClippingRegion( const wxRegion &region )
{
if (region.Empty())
{
DestroyClippingRegion();
return;
}
gdk_gc_set_clip_region( m_penGC, region.GetRegion() );
gdk_gc_set_clip_region( m_brushGC, region.GetRegion() );
gdk_gc_set_clip_region( m_textGC, region.GetRegion() );
gdk_gc_set_clip_region( m_bgGC, region.GetRegion() );
}
void wxWindowDC::DestroyClippingRegion(void)
{
wxDC::DestroyClippingRegion();

2
src/gtk1/win_gtk.c
View File

@@ -211,7 +211,7 @@ gtk_myfixed_move (GtkMyFixed *myfixed,
if (child->widget == widget)
{
/* if ((child->x == x) && (child->y == y)) return; */
if ((child->x == x) && (child->y == y)) return;
child->x = x;
child->y = y;

141
src/gtk1/window.cpp
View File

@@ -1729,38 +1729,38 @@ int wxWindow::GetCharHeight() const
int wxWindow::GetCharWidth() const
{
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
if (!m_font.Ok())
{
wxFAIL_MSG( "invalid font" );
return -1;
}
if (!m_font.Ok())
{
wxFAIL_MSG( "invalid font" );
return -1;
}
GdkFont *font = m_font.GetInternalFont( 1.0 );
return gdk_string_width( font, "H" );
GdkFont *font = m_font.GetInternalFont( 1.0 );
return gdk_string_width( font, "H" );
}
void wxWindow::GetTextExtent( const wxString& string, int *x, int *y,
int *descent, int *externalLeading, const wxFont *theFont, bool WXUNUSED(use16) ) const
{
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
wxFont fontToUse = m_font;
if (theFont) fontToUse = *theFont;
wxFont fontToUse = m_font;
if (theFont) fontToUse = *theFont;
if (!fontToUse.Ok())
{
wxFAIL_MSG( "invalid font" );
return;
}
wxASSERT_MSG( (m_font.Ok()), "invalid font" );
if (!fontToUse.Ok())
{
wxFAIL_MSG( "invalid font" );
return;
}
wxASSERT_MSG( (m_font.Ok()), "invalid font" );
GdkFont *font = fontToUse.GetInternalFont( 1.0 );
if (x) (*x) = gdk_string_width( font, string );
if (y) (*y) = font->ascent + font->descent;
if (descent) (*descent) = font->descent;
if (externalLeading) (*externalLeading) = 0; // ??
GdkFont *font = fontToUse.GetInternalFont( 1.0 );
if (x) (*x) = gdk_string_width( font, string );
if (y) (*y) = font->ascent + font->descent;
if (descent) (*descent) = font->descent;
if (externalLeading) (*externalLeading) = 0; // ??
}
void wxWindow::MakeModal( bool modal )
@@ -1783,105 +1783,122 @@ void wxWindow::MakeModal( bool modal )
void wxWindow::SetFocus()
{
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
GtkWidget *connect_widget = GetConnectWidget();
if (connect_widget)
{
if (GTK_WIDGET_CAN_FOCUS(connect_widget) && !GTK_WIDGET_HAS_FOCUS (connect_widget) )
GtkWidget *connect_widget = GetConnectWidget();
if (connect_widget)
{
gtk_widget_grab_focus (connect_widget);
if (GTK_WIDGET_CAN_FOCUS(connect_widget) && !GTK_WIDGET_HAS_FOCUS (connect_widget) )
{
gtk_widget_grab_focus (connect_widget);
}
}
}
}
bool wxWindow::OnClose()
{
return TRUE;
return TRUE;
}
void wxWindow::AddChild( wxWindow *child )
{
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
wxASSERT_MSG( (child != NULL), "invalid child" );
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
wxASSERT_MSG( (child != NULL), "invalid child" );
m_children.Append( child );
m_children.Append( child );
}
wxList *wxWindow::GetChildren()
{
return (&m_children);
return (&m_children);
}
wxWindow *wxWindow::ReParent( wxWindow *newParent )
{
wxWindow *oldParent = GetParent();
if (oldParent) oldParent->RemoveChild( this );
gtk_widget_unparent( m_widget );
if (newParent)
{
newParent->AddChild( this );
(newParent->m_insertCallback)( newParent, this );
}
return oldParent;
}
void wxWindow::RemoveChild( wxWindow *child )
{
if (GetChildren()) GetChildren()->DeleteObject( child );
child->m_parent = (wxWindow *) NULL;
if (GetChildren()) GetChildren()->DeleteObject( child );
child->m_parent = (wxWindow *) NULL;
}
void wxWindow::SetReturnCode( int retCode )
{
m_retCode = retCode;
m_retCode = retCode;
}
int wxWindow::GetReturnCode()
{
return m_retCode;
return m_retCode;
}
void wxWindow::Raise()
{
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
if (m_widget) gdk_window_raise( m_widget->window );
if (m_widget) gdk_window_raise( m_widget->window );
}
void wxWindow::Lower()
{
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
if (m_widget) gdk_window_lower( m_widget->window );
if (m_widget) gdk_window_lower( m_widget->window );
}
wxEvtHandler *wxWindow::GetEventHandler()
{
return m_eventHandler;
return m_eventHandler;
}
void wxWindow::SetEventHandler( wxEvtHandler *handler )
{
m_eventHandler = handler;
m_eventHandler = handler;
}
void wxWindow::PushEventHandler(wxEvtHandler *handler)
{
handler->SetNextHandler(GetEventHandler());
SetEventHandler(handler);
handler->SetNextHandler(GetEventHandler());
SetEventHandler(handler);
}
wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler)
{
if (GetEventHandler())
{
wxEvtHandler *handlerA = GetEventHandler();
wxEvtHandler *handlerB = handlerA->GetNextHandler();
handlerA->SetNextHandler((wxEvtHandler *) NULL);
SetEventHandler(handlerB);
if (deleteHandler)
if (GetEventHandler())
{
delete handlerA;
return (wxEvtHandler*) NULL;
}
else
return handlerA;
}
else
return (wxEvtHandler *) NULL;
wxEvtHandler *handlerA = GetEventHandler();
wxEvtHandler *handlerB = handlerA->GetNextHandler();
handlerA->SetNextHandler((wxEvtHandler *) NULL);
SetEventHandler(handlerB);
if (deleteHandler)
{
delete handlerA;
return (wxEvtHandler*) NULL;
}
else
return handlerA;
}
else
return (wxEvtHandler *) NULL;
}
wxValidator *wxWindow::GetValidator()
{
return m_windowValidator;
return m_windowValidator;
}
void wxWindow::SetValidator( const wxValidator& validator )