[prev in list] [next in list] [prev in thread] [next in thread] 

List:       flightgear-cvs
Subject:    [Flightgear-cvslogs] CVS: source/src/GUI dialog.cxx,1.112,1.113
From:       Melchior Franz <mfranz () baron ! flightgear ! org>
Date:       2009-01-31 16:30:43
Message-ID: 200901311630.n0VGUh1S012881 () baron ! flightgear ! org
[Download RAW message or body]

Update of /var/cvs/FlightGear-0.9/source/src/GUI
In directory baron.flightgear.org:/tmp/cvs-serv12874/src/GUI

Modified Files:
	dialog.cxx 
Log Message:
move <text> before <property> part, so that <format>s are applied initially

Index: dialog.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/GUI/dialog.cxx,v
retrieving revision 1.112
retrieving revision 1.113
diff -C 2 -r1.112 -r1.113
*** dialog.cxx	29 Jan 2009 18:50:16 -0000	1.112
--- dialog.cxx	31 Jan 2009 16:30:38 -0000	1.113
***************
*** 846,849 ****
--- 846,865 ----
      }
  
+     string type = props->getName();
+     if (type == "input" && props->getBoolValue("live"))
+         object->setDownCallback(action_callback);
+ 
+     if (type == "text") {
+         const char *format = props->getStringValue("format", 0);
+         if (format) {
+             info->fmt_type = validate_format(format);
+             if (info->fmt_type != f_INVALID)
+                 info->format = format;
+             else
+                 SG_LOG(SG_GENERAL, SG_ALERT, "DIALOG: invalid <format> '"
+                         << format << '\'');
+         }
+     }
+ 
      if (props->hasValue("property")) {
          const char *name = props->getStringValue("name");
***************
*** 883,902 ****
          object->setCallback(action_callback);
      }
- 
-     string type = props->getName();
-     if (type == "input" && props->getBoolValue("live"))
-         object->setDownCallback(action_callback);
- 
-     if (type == "text") {
-         const char *format = props->getStringValue("format", 0);
-         if (format) {
-             info->fmt_type = validate_format(format);
-             if (info->fmt_type != f_INVALID)
-                 info->format = format;
-             else
-                 SG_LOG(SG_GENERAL, SG_ALERT, "DIALOG: invalid <format> '"
-                         << format << '\'');
-         }
-     }
  }
  
--- 899,902 ----


------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Flightgear-cvslogs mailing list
Flightgear-cvslogs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-cvslogs
[prev in list] [next in list] [prev in thread] [next in thread]