[Flightgear-devel] [PATCH] plib & libpuaux & puaComboBox

[Melchior F. <mf...@ao...>]

For those not following the flightgear-cvslogs list: as plib/cvs finally
removed some widgets that were marked deprecated since a few years, we
switched to the "new" and recommended replacements (that are in plib
since 1.8.4), for example puComboBox to puaComboBox. After the switch
it turned out that puaComboBox has a bug. A fix for it has been
submitted to the plib-devel list and will most likely be included in
the upcoming 1.8.5 release (which we should depend on for several other
reasons). The bug is: comboboxes aren't updated. For example the TACAN
channel. The channel digits *are* set, you just don't see the effect
in the dialog. Below is a fix for it (upper part, the lower one is for
another bug :-). It's not approved yet, so it may look differently
in 1.8.5, but it's safe to apply, anyway. The good news: there are
yet more bugs in pui/puAux ...   ;-)

m.


Index: puAux.h
===================================================================
RCS file: /cvsroot/plib/plib/src/puAux/puAux.h,v
retrieving revision 1.11
diff -u -p -r1.11 puAux.h
--- puAux.h     25 Mar 2006 00:34:08 -0000      1.11
+++ puAux.h     20 May 2006 19:21:59 -0000
@@ -269,6 +269,11 @@ public:

   void setSize ( int w, int h ) ;

+  void setValue ( float f ) { puValue::setValue ( f ) ;  input->setValue ( f ) ; }
+  void setValue ( int i ) { puValue::setValue ( i ) ;  input->setValue ( i ) ; }
+  void setValue ( const char *s ) { puValue::setValue ( s ) ;  input->setValue ( s ) ; }
+  void setValue ( puValue *pv ) { puValue::setValue ( pv ) ;  input->setValue ( pv ) ; }
+
   void draw ( int dx, int dy ) ;
   int  checkHit ( int button, int updown, int x, int y ) ;
   int  checkKey ( int key, int updown ) ;
@@ -914,8 +919,8 @@ public:
   virtual void   setSize (int w, int h);

   int  getNumItems ( void ) const ;
-  int  getTopItem  ( void ) const ;
-  void setTopItem  ( int item_index );
+  int  getTopItem  ( void ) const { return _list_box->getTopItem(); }
+  void setTopItem  ( int item_index ) { _list_box->setTopItem(item_index); }
 };

 #endif
l