Skip to content
Snippets Groups Projects
Commit 8d791623 authored by Lyle Johnson's avatar Lyle Johnson
Browse files

Revert "implemented Ryan Melton's patch for RubyForge Bug #24898"

This reverts commit 13dbbd0f.
parent 13dbbd0f
No related branches found
No related tags found
No related merge requests found
......@@ -198,7 +198,7 @@ void FXRbWindow::markfunc(FXWindow* self){
// Mark child windows
register FXWindow* child=self->getFirst();
while((child!=NULL) && (!(NIL_P(FXRbGetRubyObj(child,true))))){
while(child!=NULL){
FXRbGcMark(child);
child=child->getNext();
}
......@@ -296,25 +296,6 @@ void FXRbCursor::freefunc(FXCursor* self){
delete_if_not_owned_by_app(self,reinterpret_cast<FXRbCursor*>(0));
}
/**
* Overrides base class version of getFocusWindow() to address
* RubyForge Bug #24898.
*/
static FXWindow*
getFocusWindow(FXApp *self)
{
FXWindow *result=self->getActiveWindow();
VALUE value=FXRbGetRubyObj(result,true);
if(!NIL_P(value)){
if(result){
while(result->getFocus()){
result=result->getFocus();
}
}
return result;
}
return NULL;
}
void FXRbApp::markfunc(FXApp *self){
FXRbObject::markfunc(self);
......@@ -354,7 +335,7 @@ void FXRbApp::markfunc(FXApp *self){
FXRbGcMark(self->getDefaultCursor(DEF_ROTATE_CURSOR));
// Other windows
FXRbGcMark(::getFocusWindow(self));
FXRbGcMark(self->getFocusWindow());
FXRbGcMark(self->getCursorWindow());
/**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment