# HG changeset patch
# User Kai Habel <kai.habel@gmx.de>
# Date 1289484063 -3600
# Node ID 5fa7667f90e5337203d345e4329fcd5592bd8d16
# Parent  1783b360976f4268a823327e5730a59a26db6bb6
Add prefix ID_ to property ids to avoid name clash on windows

diff -r 1783b360976f -r 5fa7667f90e5 src/ChangeLog
--- a/src/ChangeLog	Thu Nov 11 02:30:32 2010 -0500
+++ b/src/ChangeLog	Thu Nov 11 15:01:03 2010 +0100
@@ -1,3 +1,11 @@
+2010-11-11  Kai Habel  <kai.habel@gmx.de>
+
+	* fltk-backend.cc (plot_window::uimenu_update,
+	fltk_backend::update): Add prefix 'ID_' to property ids to avoid
+	name clash on windows systems.
+	* graphics.cc (gnuplot_backend::update): Dito.
+	* genprops.awk (emit_declarations, emit_source): Dito
+
 2010-11-11  John W. Eaton  <jwe@octave.org>
 
 	Bug #31165.
diff -r 1783b360976f -r 5fa7667f90e5 src/DLD-FUNCTIONS/fltk_backend.cc
--- a/src/DLD-FUNCTIONS/fltk_backend.cc	Thu Nov 11 02:30:32 2010 -0500
+++ b/src/DLD-FUNCTIONS/fltk_backend.cc	Thu Nov 11 15:01:03 2010 +0100
@@ -796,34 +796,34 @@
         
         switch(id)
           {
-            case base_properties::BEINGDELETED:
+            case base_properties::ID_BEINGDELETED:
               uimenu->remove_from_menu (uimenup);
               break;
-            case base_properties::VISIBLE:
+            case base_properties::ID_VISIBLE:
               uimenu->update_visible (uimenup);
               break;
-            case uimenu::properties::ACCELERATOR:
+            case uimenu::properties::ID_ACCELERATOR:
               uimenu->update_accelerator (uimenup);
               break;
-            case uimenu::properties::CALLBACK:
+            case uimenu::properties::ID_CALLBACK:
               uimenu->update_callback (uimenup);
               break;
-            case uimenu::properties::CHECKED:
+            case uimenu::properties::ID_CHECKED:
               uimenu->add_to_menu (figp);//rebuilding entire menu
               break;
-            case uimenu::properties::ENABLE:
+            case uimenu::properties::ID_ENABLE:
               uimenu->update_enable (uimenup);
               break;
-            case uimenu::properties::FOREGROUNDCOLOR:
+            case uimenu::properties::ID_FOREGROUNDCOLOR:
               uimenu->update_foregroundcolor (uimenup);
               break;
-            case uimenu::properties::LABEL:
+            case uimenu::properties::ID_LABEL:
               uimenu->add_to_menu (figp);//rebuilding entire menu
               break;
-            case uimenu::properties::POSITION:
+            case uimenu::properties::ID_POSITION:
               uimenu->add_to_menu (figp);//rebuilding entire menu
               break;
-            case uimenu::properties::SEPARATOR:
+            case uimenu::properties::ID_SEPARATOR:
               uimenu->update_seperator (uimenup);
               break;
           }
@@ -1804,17 +1804,17 @@
             
             switch (id)
               {
-                case base_properties::VISIBLE:
+                case base_properties::ID_VISIBLE:
                   figure_manager::toggle_window_visibility (ov.string_value (), fp.is_visible ());
                   break;
-                case figure::properties::MENUBAR:
+                case figure::properties::ID_MENUBAR:
 		  figure_manager::toggle_menubar_visibility (ov.string_value (), fp.menubar_is("figure"));
                   break;
-                case figure::properties::NAME:
-		case figure::properties::CURRENTAXES:
+                case figure::properties::ID_NAME:
+		case figure::properties::ID_CURRENTAXES:
                   figure_manager::update_canvas (go.get_handle (), fp.get_currentaxes ());
                   break;
-                case figure::properties::NUMBERTITLE:
+                case figure::properties::ID_NUMBERTITLE:
                   figure_manager::set_name (ov.string_value ());
                   break;
               }
@@ -1822,7 +1822,7 @@
       }
     else if (go.isa ("uimenu"))
       {
-        if (id == uimenu::properties::LABEL)
+        if (id == uimenu::properties::ID_LABEL)
           uimenu_set_fltk_label (go);
         
         graphics_object fig = xget_ancestor(go,"figure");
diff -r 1783b360976f -r 5fa7667f90e5 src/genprops.awk
--- a/src/genprops.awk	Thu Nov 11 02:30:32 2010 -0500
+++ b/src/genprops.awk	Thu Nov 11 15:01:03 2010 +0100
@@ -283,7 +283,7 @@
     printf ("  enum\n  {");
     for (i = 1; i <= idx; i++)
     {
-      printf ("%s\n    %s = %d", (i == 1 ? "" : ","), toupper(name[i]), pcount);
+      printf ("%s\n    ID_%s = %d", (i == 1 ? "" : ","), toupper(name[i]), pcount);
       pcount++;
     }
     printf ("\n  };\n\n");
@@ -425,7 +425,7 @@
 ##    printf ("  insert_static_property (\"%s\", %s);\n", name[i], name[i]);
       if (ptype[i])
       {
-        printf ("  %s.set_id (%s);\n", name[i], toupper(name[i]));
+        printf ("  %s.set_id (ID_%s);\n", name[i], toupper(name[i]));
         if (hidden[i])
           printf ("  %s.set_hidden (true);\n", name[i]);
       }
diff -r 1783b360976f -r 5fa7667f90e5 src/graphics.cc
--- a/src/graphics.cc	Thu Nov 11 02:30:32 2010 -0500
+++ b/src/graphics.cc	Thu Nov 11 15:01:03 2010 +0100
@@ -2345,7 +2345,7 @@
 
           switch (id)
             {
-            case base_properties::VISIBLE:
+            case base_properties::ID_VISIBLE:
               if (! props.is_visible ())
                 {
                   send_quit (props.get___plot_stream__ ());