Re: [lmi] sequence input editor -- how to get accepted keywords

[Greg Chicares]

On 2010-06-26 13:45Z, Greg Chicares wrote:
[...]
> Here's a patch, made thus:
>   $diff -U3 a00/vs-pristine/ . |sed -e'/Only in \.:/d' >/dev/clipboard
> with all those changes:

Oops, no, disregard that and use the following instead, which fixes a
mistake I made and also resolves this msw-xp issue:
  http://lists.nongnu.org/archive/html/lmi/2010-06/msg00021.html

diff -U3 a00/vs-pristine/input_sequence_entry.cpp ./input_sequence_entry.cpp
--- a00/vs-pristine/input_sequence_entry.cpp    2010-06-25 15:28:18.308787400 
+0000
+++ ./input_sequence_entry.cpp  2010-06-26 13:56:52.000000000 +0000
@@ -54,6 +54,12 @@
 #include <map>
 #include <vector>

+// Temporary artifact:
+//  - define this for wx svn HEAD
+//  - don't define it for wx-2.9.0 release tarball
+//
+//#define LMI_WX_HEAD
+
 namespace
 {

@@ -153,6 +159,7 @@
         case e_inforce:
         case e_retirement:
         case e_maturity:
+        default:
             return false;
         }
 }
@@ -275,7 +282,11 @@
 {
     wxSizer *top = new(wx) wxBoxSizer(wxVERTICAL);

+#if defined LMI_WX_HEAD
     sizer_ = new(wx) wxFlexGridSizer(Col_Max, wxSize(5, 5));
+#else  // !defined LMI_WX_HEAD
+    sizer_ = new(wx) wxFlexGridSizer(Col_Max, 5, 5);
+#endif // !defined LMI_WX_HEAD
     top->Add(sizer_, wxSizerFlags(1).Expand().DoubleBorder());

     wxStdDialogButtonSizer *buttons = new(wx) wxStdDialogButtonSizer();
@@ -450,7 +461,7 @@
     int insert_pos = Col_Max * row;

 #ifdef __WXMSW__
-    wxWindowUpdateLocker no_updates(this);
+//    wxWindowUpdateLocker no_updates(this);
 #endif

     int const prev_row = rows_count_ - 1;
@@ -497,17 +508,22 @@
         value_ctrl->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
         }

-    sizer_->Insert(insert_pos++, value_ctrl, 
wxSizerFlags(flags).TripleBorder(wxRIGHT));
+#if defined LMI_WX_HEAD
+// s/wxSizer::Insert/Insert/ throughout this function.
+#else  // !defined LMI_WX_HEAD
+// Need 'wxSizer::Insert' workaround.
+#endif // !defined LMI_WX_HEAD
+    sizer_->wxSizer::Insert(insert_pos++, value_ctrl, 
wxSizerFlags(flags).TripleBorder(wxRIGHT));
     wxStaticText *from_label = new(wx) wxStaticText(this, wxID_ANY, 
LARGEST_FROM_TEXT);
     SizeWinForText(from_label, LARGEST_FROM_TEXT);
-    sizer_->Insert(insert_pos++, from_label, flags);
-    sizer_->Insert(insert_pos++, new(wx) DurationModeChoice(this), flags);
+    sizer_->wxSizer::Insert(insert_pos++, from_label, flags);
+    sizer_->wxSizer::Insert(insert_pos++, new(wx) DurationModeChoice(this), 
flags);
     wxTextCtrl *duration_num = new(wx) wxTextCtrl(this, wxID_ANY, "", 
wxDefaultPosition, wxDefaultSize, wxTE_RIGHT);
     duration_num->SetValidator(wxTextValidator(wxFILTER_DIGITS));
-    sizer_->Insert(insert_pos++, duration_num, flags);
+    sizer_->wxSizer::Insert(insert_pos++, duration_num, flags);
     SizeWinForText(duration_num, "999", 20);
     wxStaticText *then_label = new(wx) wxStaticText(this, wxID_ANY, 
LARGEST_THEN_TEXT);
-    sizer_->Insert(insert_pos++, then_label, flags);
+    sizer_->wxSizer::Insert(insert_pos++, then_label, flags);
     SizeWinForText(then_label, LARGEST_THEN_TEXT);

     wxButton *remove = new(wx) wxButton
@@ -527,7 +543,7 @@
             ,NULL
             ,this
             );
-    sizer_->Insert(insert_pos++, remove, 
wxSizerFlags(flags).TripleBorder(wxLEFT));
+    sizer_->wxSizer::Insert(insert_pos++, remove, 
wxSizerFlags(flags).TripleBorder(wxLEFT));

     wxButton *add = new(wx) wxButton
                                (this
@@ -546,7 +562,7 @@
             ,NULL
             ,this
             );
-    sizer_->Insert(insert_pos++, add, wxSizerFlags(flags).Border(wxLEFT, 
0).Right());
+    sizer_->wxSizer::Insert(insert_pos++, add, 
wxSizerFlags(flags).Border(wxLEFT, 0).Right());


     // keep track of which windows belong to which rows
@@ -573,7 +589,7 @@
 void InputSequenceEditor::remove_row(int row)
 {
 #ifdef __WXMSW__
-    wxWindowUpdateLocker no_updates(this);
+//    wxWindowUpdateLocker no_updates(this);
 #endif

     duration_scalars_.erase(duration_scalars_.begin() + row);
@@ -609,7 +625,7 @@
 void InputSequenceEditor::update_row(int row)
 {
 #ifdef __WXMSW__
-    wxWindowUpdateLocker no_updates(this);
+//    wxWindowUpdateLocker no_updates(this);
 #endif

     bool const is_last_row = (row == rows_count_ - 1);
@@ -704,6 +720,7 @@
         case e_invalid_mode:
         case e_inception:
         case e_inforce:
+        default:
             {
             fatal_error() << "unexpected duration_mode value" << LMI_FLUSH;
             return "";
@@ -765,6 +782,7 @@
         case e_invalid_mode:
         case e_inception:
         case e_inforce:
+        default:
             {
             fatal_error() << "unexpected duration_mode value" << LMI_FLUSH;
             return 0;
diff -U3 a00/vs-pristine/objects.make ./objects.make
--- a00/vs-pristine/objects.make        2010-06-25 15:28:18.324412800 +0000
+++ ./objects.make      2010-06-25 16:44:58.000000000 +0000
@@ -377,6 +377,7 @@
   data_directory.o \
   database.o \
   datum_base.o \
+  datum_sequence.o \
   datum_string.o \
   dbdict.o \
   dbnames.o \