fxruby 1.2.3 → 1.2.4

data/examples/image.rb

@@ -83,57 +83,54 @@ class ImageWindow < FXMainWindow
       getApp(), FXApp::ID_QUIT, (FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|
       LAYOUT_TOP|LAYOUT_LEFT), 0, 0, 0, 0, 10, 10, 5, 5)
 
-    # Allocate the strings
-    sizeInBytes = 512*50*3
-    @grey_ramp  = "\0" * sizeInBytes
-    @red_ramp   = "\0" * sizeInBytes
-    @green_ramp = "\0" * sizeInBytes
-    @blue_ramp  = "\0" * sizeInBytes
+    # Allocate the color arrays
+    imgWidth = 512
+    imgHeight = 50
 
     # Create images with dithering
-    @grey = FXImage.new(getApp(), @grey_ramp,
-      IMAGE_DITHER|IMAGE_SHMI|IMAGE_SHMP, 512, 50)
-    @red = FXImage.new(getApp(), @red_ramp,
-      IMAGE_DITHER|IMAGE_SHMI|IMAGE_SHMP, 512, 50)
-    @green = FXImage.new(getApp(), @green_ramp,
-      IMAGE_DITHER|IMAGE_SHMI|IMAGE_SHMP, 512, 50)
-    @blue = FXImage.new(getApp(), @blue_ramp,
-      IMAGE_DITHER|IMAGE_SHMI|IMAGE_SHMP, 512, 50)
+    @grey = FXImage.new(getApp(), nil,
+      IMAGE_OWNED|IMAGE_DITHER|IMAGE_SHMI|IMAGE_SHMP, imgWidth, imgHeight)
+    @red = FXImage.new(getApp(), nil,
+      IMAGE_OWNED|IMAGE_DITHER|IMAGE_SHMI|IMAGE_SHMP, imgWidth, imgHeight)
+    @green = FXImage.new(getApp(), nil,
+      IMAGE_OWNED|IMAGE_DITHER|IMAGE_SHMI|IMAGE_SHMP, imgWidth, imgHeight)
+    @blue = FXImage.new(getApp(), nil,
+      IMAGE_OWNED|IMAGE_DITHER|IMAGE_SHMI|IMAGE_SHMP, imgWidth, imgHeight)
   
     # Create image with nearest color instead of dithering
-    @grey_nodither = FXImage.new(getApp(), @grey_ramp,
-      IMAGE_NEAREST|IMAGE_SHMI|IMAGE_SHMP, 512, 50)
-    @red_nodither = FXImage.new(getApp(), @red_ramp,
-      IMAGE_NEAREST|IMAGE_SHMI|IMAGE_SHMP, 512, 50)
-    @green_nodither = FXImage.new(getApp(), @green_ramp,
-      IMAGE_NEAREST|IMAGE_SHMI|IMAGE_SHMP, 512, 50)
-    @blue_nodither = FXImage.new(getApp(), @blue_ramp,
-      IMAGE_NEAREST|IMAGE_SHMI|IMAGE_SHMP, 512, 50)
+    @grey_nodither = FXImage.new(getApp(), nil,
+      IMAGE_OWNED|IMAGE_NEAREST|IMAGE_SHMI|IMAGE_SHMP, imgWidth, imgHeight)
+    @red_nodither = FXImage.new(getApp(), nil,
+      IMAGE_OWNED|IMAGE_NEAREST|IMAGE_SHMI|IMAGE_SHMP, imgWidth, imgHeight)
+    @green_nodither = FXImage.new(getApp(), nil,
+      IMAGE_OWNED|IMAGE_NEAREST|IMAGE_SHMI|IMAGE_SHMP, imgWidth, imgHeight)
+    @blue_nodither = FXImage.new(getApp(), nil,
+      IMAGE_OWNED|IMAGE_NEAREST|IMAGE_SHMI|IMAGE_SHMP, imgWidth, imgHeight)
   
     # Result image
     @picture = FXBMPImage.new(getApp(), nil, IMAGE_SHMI|IMAGE_SHMP, 850, 600)
 
     # Fill up the color-ramp byte arrays (strings)
+    grey_data = @grey.data
+    grey_nodither_data = @grey_nodither.data
+    red_data = @red.data
+    red_nodither_data = @red_nodither.data
+    green_data = @green.data
+    green_nodither_data = @green_nodither.data
+    blue_data = @blue.data
+    blue_nodither_data = @blue_nodither.data
     (0...512).each { |x|
+      halfX = x >> 1
       (0...50).each { |y|
-        @grey.data[3*(y*512+x)  ]  = (x/2)
-        @grey.data[3*(y*512+x)+1]  = (x/2)
-        @grey.data[3*(y*512+x)+2]  = (x/2)
-      }
-      (0...50).each { |y|
-        @red.data[3*(y*512+x)  ]   = (x/2)
-        @red.data[3*(y*512+x)+1]   = 0
-        @red.data[3*(y*512+x)+2]   = 0
-      }
-      (0...50).each { |y|
-        @green.data[3*(y*512+x)  ] = 0
-        @green.data[3*(y*512+x)+1] = (x/2)
-        @green.data[3*(y*512+x)+2] = 0
-      }
-      (0...50).each { |y|
-        @blue.data[3*(y*512+x)  ]  = 0
-        @blue.data[3*(y*512+x)+1]  = 0
-        @blue.data[3*(y*512+x)+2]  = (x/2)
+	z = (y << 9) + x
+        grey_data[z]  = FXRGB(halfX, halfX, halfX)
+	grey_nodither_data[z] = grey_data[z]
+        red_data[z]   = FXRGB(halfX, 0, 0)
+	red_nodither_data[z] = red_data[z]
+        green_data[z] = FXRGB(0, halfX, 0)
+	green_nodither_data[z] = green_data[z]
+        blue_data[z]  = FXRGB(0, 0, halfX)
+	blue_nodither_data[z] = blue_data[z]
       }
     }
 

data/examples/mditest2.rb

@@ -0,0 +1,195 @@
+#!/usr/bin/env ruby
+
+require 'fox12'
+require 'fox12/colors'
+
+include Fox
+
+TYGER = <<END_OF_POEM
+The Tyger
+
+Tyger! Tyger! burning bright
+In the forests of the night
+What immortal hand or eye
+Could frame thy fearful symmetry?
+
+In what distant deeps or skies
+Burnt the fire of thine eyes?
+On what wings dare he aspire?
+What the hand dare seize the fire?
+
+And what shoulder, and what art,
+Could twist the sinews of thy heart,
+And when thy heart began to beat,
+What dread hand? and what dread feet?
+
+What the hammer? what the chain?
+In what furnace was thy brain?
+What the anvil? what dread grasp
+Dare its deadly terrors clasp?
+
+When the stars threw down their spears,
+And water'd heaven with their tears,
+Did he smile his work to see?
+Did he who made the Lamb make thee?
+
+Tyger! Tyger! burning bright
+In the forests of the night,
+What immortal hand or eye,
+Dare frame thy fearful symmetry?
+
+
+
+               - William Blake
+END_OF_POEM
+
+class MDITestWindow  < FXMainWindow
+
+  def initialize(app)
+    # Invoke base class initialize method first
+    super(app, "MDI Widget Test", nil, nil, DECOR_ALL, 0, 0, 800, 600)
+
+    # Create the font
+    @font = FXFont.new(getApp(), "courier", 15, FONTWEIGHT_BOLD)
+  
+    # Menubar
+    menubar = FXMenuBar.new(self, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
+  
+    # Status bar
+    FXStatusBar.new(self,
+      LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|STATUSBAR_WITH_DRAGCORNER)
+  
+    # MDI Client
+    @mdiclient = FXMDIClient.new(self, LAYOUT_FILL_X|LAYOUT_FILL_Y)
+  
+    # Icon for MDI Child
+    @mdiicon = nil
+    File.open(File.join("icons", "penguin.png"), "rb") { |f|
+      @mdiicon = FXPNGIcon.new(getApp(), f.read)
+    }
+
+    # Make MDI Menu
+    @mdimenu = FXMDIMenu.new(self, @mdiclient)
+  
+    # MDI buttons in menu:- note the message ID's!!!!!
+    # Normally, MDI commands are simply sensitized or desensitized;
+    # Under the menubar, however, they're hidden if the MDI Client is
+    # not maximized.  To do this, they must have different ID's.
+    FXMDIWindowButton.new(menubar, @mdimenu, @mdiclient, FXMDIClient::ID_MDI_MENUWINDOW,
+      LAYOUT_LEFT)
+    FXMDIDeleteButton.new(menubar, @mdiclient, FXMDIClient::ID_MDI_MENUCLOSE,
+      FRAME_RAISED|LAYOUT_RIGHT)
+    FXMDIRestoreButton.new(menubar, @mdiclient, FXMDIClient::ID_MDI_MENURESTORE,
+      FRAME_RAISED|LAYOUT_RIGHT)
+    FXMDIMinimizeButton.new(menubar, @mdiclient,
+      FXMDIClient::ID_MDI_MENUMINIMIZE, FRAME_RAISED|LAYOUT_RIGHT)
+  
+    # Create a few test windows to get started
+    mdichild = createTestWindow(10, 10, 400, 300)
+    @mdiclient.setActiveChild(mdichild)
+    createTestWindow(20, 20, 400, 300)
+    createTestWindow(30, 30, 400, 300)
+  
+    # File menu
+    filemenu = FXMenuPane.new(self)
+    newCmd = FXMenuCommand.new(filemenu, "&New\tCtl-N\tCreate new document.")
+    newCmd.connect(SEL_COMMAND, method(:onCmdNew))
+    FXMenuCommand.new(filemenu, "&Quit\tCtl-Q\tQuit application.", nil,
+      getApp(), FXApp::ID_QUIT, 0)
+    FXMenuTitle.new(menubar, "&File", nil, filemenu)
+      
+    # Window menu
+    windowmenu = FXMenuPane.new(self)
+    FXMenuCommand.new(windowmenu, "Tile &Horizontally", nil,
+      @mdiclient, FXMDIClient::ID_MDI_TILEHORIZONTAL)
+    FXMenuCommand.new(windowmenu, "Tile &Vertically", nil,
+      @mdiclient, FXMDIClient::ID_MDI_TILEVERTICAL)
+    FXMenuCommand.new(windowmenu, "C&ascade", nil,
+      @mdiclient, FXMDIClient::ID_MDI_CASCADE)
+    FXMenuCommand.new(windowmenu, "&Close", nil,
+      @mdiclient, FXMDIClient::ID_MDI_CLOSE)
+    sep1 = FXMenuSeparator.new(windowmenu)
+    sep1.setTarget(@mdiclient)
+    sep1.setSelector(FXMDIClient::ID_MDI_ANY)
+    FXMenuCommand.new(windowmenu, nil, nil, @mdiclient, FXMDIClient::ID_MDI_1)
+    FXMenuCommand.new(windowmenu, nil, nil, @mdiclient, FXMDIClient::ID_MDI_2)
+    FXMenuCommand.new(windowmenu, nil, nil, @mdiclient, FXMDIClient::ID_MDI_3)
+    FXMenuCommand.new(windowmenu, nil, nil, @mdiclient, FXMDIClient::ID_MDI_4)
+    FXMenuCommand.new(windowmenu, "&Others...", nil, @mdiclient, FXMDIClient::ID_MDI_OVER_5)
+    FXMenuTitle.new(menubar,"&Window", nil, windowmenu)
+    
+    # Help menu
+    helpmenu = FXMenuPane.new(self)
+    FXMenuCommand.new(helpmenu, "&About FOX...").connect(SEL_COMMAND) {
+      FXMessageBox.information(self, MBOX_OK, "About MDI Test",
+        "Test of the FOX MDI Widgets\nWritten by Jeroen van der Zijp")
+    }
+    FXMenuTitle.new(menubar, "&Help", nil, helpmenu, LAYOUT_RIGHT)
+  end
+
+  #
+  # Create a new MDI child window.
+  #
+  # When Ruby's GC is marking the FXTable, we also call FXRbGcMark() on all of
+  # the table's items (see FXRbTable::markfunc in markfuncs.cpp).
+  #
+  def createTestWindow(x, y, w, h)
+    mdichild = FXMDIChild.new(@mdiclient, "Child", nil, nil,0, x, y, w, h)
+    scrollwindow = FXScrollWindow.new(mdichild, 0)
+    scrollwindow.verticalScrollBar.setLine(@font.fontHeight)
+    tbl = FXTable.new(scrollwindow, nil, 0, TABLE_COL_SIZABLE|TABLE_ROW_SIZABLE|LAYOUT_FILL_X|LAYOUT_FILL_Y, 0, 0, 0, 0, 2, 2, 2, 2)
+    nr, nc = 200, 200
+    tbl.setTableSize(nr, nc)
+    (0...nc).each { |c|
+      tbl.setColumnText(c,c.to_s)
+    }
+    (0...nr).each { |r|
+      tbl.setRowText(r,r.to_s)
+    }
+    (0...nr).each { |r|
+      (0...nc).each { |c|
+        tbl.setItemText(r,c,"#{r},#{c}")
+      }
+    }
+    mdichild
+  end
+
+  # New
+  def onCmdNew(sender, sel, ptr)
+    mdichild = createTestWindow(20, 20, 300, 200)
+    mdichild.create
+    return 1
+  end
+
+  # Start
+  def create
+    super
+
+    # At the time the first three MDI windows are constructed, we don't
+    # yet know the font height and so we cannot accurately set the line
+    # height for the vertical scrollbar. Now that the real font has been
+    # created, we can go back and fix the scrollbar line heights for these
+    # windows.
+    @font.create
+    @mdiclient.each_child do |mdichild|
+      mdichild.contentWindow.verticalScrollBar.setLine(@font.fontHeight)
+    end
+
+    show(PLACEMENT_SCREEN)
+  end
+end
+
+if __FILE__ == $0
+  # Make application
+  application = FXApp.new("MDIApp", "FoxTest")
+  application.init(ARGV)
+  
+  # Make window
+  MDITestWindow.new(application)
+  
+  # Create app
+  application.create
+  
+  # Run
+  application.run
+end

data/ext/fox12/FXRuby.cpp

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRuby.cpp,v 1.3 2005/01/15 20:02:42 lyle Exp $
+ * $Id: FXRuby.cpp,v 1.4 2005/01/27 03:58:46 lyle Exp $
  ***********************************************************************/
 
 #ifdef _MSC_VER
@@ -36,6 +36,11 @@
 #define RB_RESCUE2_BROKEN_PROTOTYPE 1
 #endif
 
+/* The prototype for st_foreach() changed at Ruby version 1.8.2 */
+#if RUBY_VERSION_CODE < 182
+#define ST_BROKEN_PROTOTYPES 1
+#endif
+
 #include "impl.h"
 
 #ifdef __CYGWIN__
@@ -53,17 +58,32 @@ extern "C" {
 // Symbol table functions from Ruby. If we included "st.h" directly
 // we'd be dealing with broken prototypes anyways, so just duplicate
 // the needed declarations here with the correct prototypes.
+
+#ifdef ST_BROKEN_PROTOTYPES
+
 extern "C" {
+
 struct st_table;
 
+typedef st_data_t char *; /* this type changed to unsigned long at Ruby 1.8.2 */
+
 st_table *st_init_strtable();
 st_table *st_init_numtable();
-int st_lookup(st_table *table, char *key, char **value);
-int st_insert(st_table *table, char *key, char *value);
-int st_delete(st_table *table, char **key, char **value);
-void st_foreach(st_table *table, int (*func)(char *, char *, char *), char *arg);
+int st_lookup(st_table *table, st_data_t key, st_data_t *value);
+int st_insert(st_table *table, st_data_t key, st_data_t value);
+int st_delete(st_table *table, st_data_t *key, st_data_t *value);
+void st_foreach(st_table *table, int (*func)(st_data_t, st_data_t, st_data_t), st_data_t arg);
+
+}
+
+#else
+
+extern "C" {
+#include "st.h"
 }
 
+#endif
+
 // Opaque type declaration from SWIG runtime
 struct swig_type_info;
 
@@ -72,9 +92,9 @@ swig_type_info *FXRbTypeQuery(const char *desc){
   FXASSERT(desc!=0);
   static st_table *types=st_init_strtable();
   swig_type_info *typeinfo=0;
-  if(st_lookup(types,const_cast<char*>(desc),(char**)&typeinfo)==0){
+  if(st_lookup(types,reinterpret_cast<st_data_t>(const_cast<char*>(desc)),reinterpret_cast<st_data_t *>(&typeinfo))==0){
     typeinfo=SWIG_Ruby_TypeQuery(desc);
-    st_insert(types,strdup(desc),(char*)typeinfo);
+    st_insert(types,reinterpret_cast<st_data_t>(strdup(desc)),reinterpret_cast<st_data_t>(typeinfo));
     }
   FXASSERT(typeinfo!=0);
   return typeinfo;
@@ -121,7 +141,7 @@ VALUE FXRbNewPointerObj(void *ptr,swig_type_info* ty){
       obj=SWIG_Ruby_NewPointerObj(ptr,ty,1);
       desc->obj=obj;
       desc->borrowed=true;
-      result=st_insert(FXRuby_Objects,reinterpret_cast<char*>(ptr),reinterpret_cast<char*>(desc));
+      result=st_insert(FXRuby_Objects,reinterpret_cast<st_data_t>(ptr),reinterpret_cast<st_data_t>(desc));
       FXASSERT(result==0);
       return obj;
       }
@@ -144,7 +164,7 @@ VALUE FXRbNewPointerObj(void *ptr,swig_type_info* ty){
 bool FXRbIsBorrowed(void* ptr){
   FXASSERT(ptr!=0);
   FXRubyObjDesc *desc;
-  if(st_lookup(FXRuby_Objects,reinterpret_cast<char*>(ptr),reinterpret_cast<char**>(&desc))!=0){
+  if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(ptr),reinterpret_cast<st_data_t *>(&desc))!=0){
     return desc->borrowed;
     }
   else{
@@ -210,7 +230,7 @@ void FXRbRegisterRubyObj(VALUE rubyObj,const void* foxObj) {
   if(FXMALLOC(&desc,FXRubyObjDesc,1)){
     desc->obj=rubyObj;
     desc->borrowed=false;
-    st_insert(FXRuby_Objects,reinterpret_cast<char*>(const_cast<void*>(foxObj)),reinterpret_cast<char*>(desc));
+    st_insert(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t>(desc));
     }
   else{
     FXASSERT(FALSE);
@@ -225,11 +245,11 @@ void FXRbRegisterRubyObj(VALUE rubyObj,const void* foxObj) {
 void FXRbUnregisterRubyObj(const void* foxObj){
   if(foxObj!=0){
     FXRubyObjDesc* desc;
-    if(st_lookup(FXRuby_Objects,reinterpret_cast<char*>(const_cast<void*>(foxObj)),reinterpret_cast<char**>(&desc))!=0){
+    if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t *>(&desc))!=0){
       DATA_PTR(desc->obj)=0;
       FXFREE(&desc);
-      st_delete(FXRuby_Objects,(char**)&foxObj,reinterpret_cast<char**>(0));
-      FXASSERT(st_lookup(FXRuby_Objects,reinterpret_cast<char*>(const_cast<void*>(foxObj)),reinterpret_cast<char**>(0))==0);
+      st_delete(FXRuby_Objects,reinterpret_cast<st_data_t *>(const_cast<void**>(&foxObj)),reinterpret_cast<st_data_t *>(0));
+      FXASSERT(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t *>(0))==0);
       }
     }
   }
@@ -254,7 +274,7 @@ VALUE to_ruby(const FXObject* obj){
  */
 VALUE FXRbGetRubyObj(const void *foxObj,bool searchBoth){
   FXRubyObjDesc* desc;
-  if(foxObj!=0 && st_lookup(FXRuby_Objects,reinterpret_cast<char*>(const_cast<void*>(foxObj)),reinterpret_cast<char**>(&desc))!=0){
+  if(foxObj!=0 && st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t *>(&desc))!=0){
     FXASSERT(desc!=0);
     if(searchBoth){
       return desc->obj;
@@ -1660,32 +1680,36 @@ static st_table * appSensitiveDCs;
 void FXRbRegisterAppSensitiveObject(FXObject* obj){
   FXASSERT(obj!=0);
   FXTRACE((100,"%s:%d: FXRbRegisterAppSensitiveObject(obj=0x%08x(%s))\n",__FILE__,__LINE__,obj,obj->getClassName()));
-  st_insert(appSensitiveObjs,reinterpret_cast<char*>(obj),reinterpret_cast<char*>(0));
-  FXASSERT(st_lookup(appSensitiveObjs,reinterpret_cast<char*>(obj),reinterpret_cast<char**>(0))!=0);
+  st_insert(appSensitiveObjs,reinterpret_cast<st_data_t>(obj),(st_data_t)0);
+  FXASSERT(st_lookup(appSensitiveObjs,reinterpret_cast<st_data_t>(obj),reinterpret_cast<st_data_t *>(0))!=0);
   }
 
 void FXRbRegisterAppSensitiveObject(FXDC* dc){
   FXASSERT(dc!=0);
   FXTRACE((100,"%s:%d: FXRbRegisterAppSensitiveObject(dc=0x%08x)\n",__FILE__,__LINE__,dc));
-  st_insert(appSensitiveDCs,reinterpret_cast<char*>(dc),reinterpret_cast<char*>(0));
-  FXASSERT(st_lookup(appSensitiveDCs,reinterpret_cast<char*>(dc),reinterpret_cast<char**>(0))!=0);
+  st_insert(appSensitiveDCs,reinterpret_cast<st_data_t>(dc),(st_data_t)0);
+  FXASSERT(st_lookup(appSensitiveDCs,reinterpret_cast<st_data_t>(dc),reinterpret_cast<st_data_t *>(0))!=0);
   }
 
 void FXRbUnregisterAppSensitiveObject(FXObject* obj){
   FXASSERT(obj!=0);
   FXTRACE((100,"%s:%d: FXRbUnregisterAppSensitiveObject(obj=0x%08x(%s))\n",__FILE__,__LINE__,obj,obj->getClassName()));
-  st_delete(appSensitiveObjs,reinterpret_cast<char**>(&obj),reinterpret_cast<char**>(0));
-  FXASSERT(st_lookup(appSensitiveObjs,reinterpret_cast<char*>(obj),reinterpret_cast<char**>(0))==0);
+  st_delete(appSensitiveObjs,reinterpret_cast<st_data_t *>(&obj),reinterpret_cast<st_data_t *>(0));
+  FXASSERT(st_lookup(appSensitiveObjs,reinterpret_cast<st_data_t>(obj),reinterpret_cast<st_data_t *>(0))==0);
   }
 
 void FXRbUnregisterAppSensitiveObject(FXDC* dc){
   FXASSERT(dc!=0);
   FXTRACE((100,"%s:%d: FXRbUnregisterAppSensitiveObject(dc=0x%08x)\n",__FILE__,__LINE__,dc));
-  st_delete(appSensitiveDCs,reinterpret_cast<char**>(&dc),reinterpret_cast<char**>(0));
-  FXASSERT(st_lookup(appSensitiveDCs,reinterpret_cast<char*>(dc),reinterpret_cast<char**>(0))==0);
+  st_delete(appSensitiveDCs,reinterpret_cast<st_data_t *>(&dc),reinterpret_cast<st_data_t *>(0));
+  FXASSERT(st_lookup(appSensitiveDCs,reinterpret_cast<st_data_t>(dc),reinterpret_cast<st_data_t *>(0))==0);
   }
 
-static int st_cbfunc_obj(char *key,char *,char* arg){
+#ifdef ST_BROKEN_PROTOTYPES
+static int st_cbfunc_obj(st_data_t key,st_data_t,st_data_t arg){
+#else
+static int st_cbfunc_obj(st_data_t key,st_data_t,st_data_t arg,int){
+#endif
   FXASSERT(key!=0);
   FXASSERT(arg!=0);
   FXObjectListOf<FXObject> *pObjectList=reinterpret_cast<FXObjectListOf<FXObject>*>(arg);
@@ -1694,7 +1718,11 @@ static int st_cbfunc_obj(char *key,char *,char* arg){
   return 0;
   }
 
-static int st_cbfunc_dc(char *key,char *,char* arg){
+#ifdef ST_BROKEN_PROTOTYPES
+static int st_cbfunc_dc(st_data_t key,st_data_t,st_data_t arg){
+#else
+static int st_cbfunc_dc(st_data_t key,st_data_t,st_data_t arg,int){
+#endif
   FXASSERT(key!=0);
   FXASSERT(arg!=0);
   FXArray<FXDC*> *pDCArray=reinterpret_cast<FXArray<FXDC*>*>(arg);
@@ -1707,7 +1735,11 @@ void FXRbDestroyAppSensitiveObjects(){
   FXTRACE((100,"%s:%d: Begin destroying objects that hold references to the FXApp...\n",__FILE__,__LINE__));
 
   FXObjectListOf<FXObject> objs;
-  st_foreach(appSensitiveObjs,st_cbfunc_obj,reinterpret_cast<char*>(&objs));
+#ifdef ST_BROKEN_PROTOTYPES
+  st_foreach(appSensitiveObjs,st_cbfunc_obj,reinterpret_cast<st_data_t>(&objs));
+#else
+  st_foreach(appSensitiveObjs,reinterpret_cast<int (*)(ANYARGS)>(st_cbfunc_obj),reinterpret_cast<st_data_t>(&objs));
+#endif
   for(FXint i=0;i<objs.no();i++){
     if(objs[i]->isMemberOf(FXMETACLASS(FXRbCursor))){
       if(dynamic_cast<FXRbCursor*>(objs[i])->ownedByApp)
@@ -1737,7 +1769,11 @@ void FXRbDestroyAppSensitiveObjects(){
     }
 
   FXArray<FXDC*> dcs;
-  st_foreach(appSensitiveDCs,st_cbfunc_dc,reinterpret_cast<char*>(&dcs));
+#ifdef ST_BROKEN_PROTOTYPES
+  st_foreach(appSensitiveDCs,st_cbfunc_dc,reinterpret_cast<st_data_t>(&dcs));
+#else
+  st_foreach(appSensitiveDCs,reinterpret_cast<int (*)(ANYARGS)>(st_cbfunc_dc),reinterpret_cast<st_data_t>(&dcs));
+#endif
   for(FXint j=0;j<dcs.no();j++){
     delete dcs[j];
     }