From 8d791623f1473985cee821ab0dd92b63b2319902 Mon Sep 17 00:00:00 2001
From: Lyle Johnson <lyle@lylejohnson.name>
Date: Tue, 26 May 2009 15:31:13 -0500
Subject: [PATCH] Revert "implemented Ryan Melton's patch for RubyForge Bug
#24898"
This reverts commit 13dbbd0fab636b22cb0ba8396dd0861f7e08ee26.
---
ext/fox16/markfuncs.cpp | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/ext/fox16/markfuncs.cpp b/ext/fox16/markfuncs.cpp
index 182e3ed..bea3a48 100755
--- a/ext/fox16/markfuncs.cpp
+++ b/ext/fox16/markfuncs.cpp
@@ -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());
/**
--
GitLab