drawing optimization fix

[wxWidgets.git] / src / common / resource.cpp

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index c98144c14b68c71329487d2549190cd479b583d7..49c769a1308e237003564b7d4745cb669f0251c6 100644 (file)
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -20,6 +20,12 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_WX_RESOURCES
+
+#ifdef _MSC_VER
+    #pragma warning(disable:4706)   // assignment within conditional expression
+#endif // VC++
+

 #ifndef WX_PRECOMP
 #include "wx/defs.h"
 #include "wx/setup.h"
 #ifndef WX_PRECOMP
 #include "wx/defs.h"
 #include "wx/setup.h"


@@ -36,6 +42,7 @@
 #include "wx/listbox.h"
 #include "wx/choice.h"
 #include "wx/checkbox.h"
 #include "wx/listbox.h"
 #include "wx/choice.h"
 #include "wx/checkbox.h"

+#include "wx/settings.h"

 #include "wx/slider.h"
 #include "wx/statbox.h"
 #if wxUSE_GAUGE
 #include "wx/slider.h"
 #include "wx/statbox.h"
 #if wxUSE_GAUGE


@@ -58,8 +65,6 @@
 
 #include "wx/log.h"
 
 
 #include "wx/log.h"
 

-#if wxUSE_WX_RESOURCES
-

 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>


@@ -959,26 +964,31 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
       }
       controlItem->SetStringValues(stringList);
      count ++;
       }
       controlItem->SetStringValues(stringList);
      count ++;

-
+// This is now obsolete: it's in the window style.

       // Check for wxSINGLE/wxMULTIPLE
       wxExpr *mult = (wxExpr *) NULL;
       // Check for wxSINGLE/wxMULTIPLE
       wxExpr *mult = (wxExpr *) NULL;

+/*

       controlItem->SetValue1(wxLB_SINGLE);
       controlItem->SetValue1(wxLB_SINGLE);

+*/

       if ((mult = expr->Nth(count)) && ((mult->Type() == PrologString)||(mult->Type() == PrologWord)))
       {
       if ((mult = expr->Nth(count)) && ((mult->Type() == PrologString)||(mult->Type() == PrologWord)))
       {

+/*

         wxString m(mult->StringValue());
         wxString m(mult->StringValue());

-        if (m == "wxMULTIPLE")
+        if (m == "wxLB_MULTIPLE")

           controlItem->SetValue1(wxLB_MULTIPLE);
           controlItem->SetValue1(wxLB_MULTIPLE);

-        else if (m == "wxEXTENDED")
+        else if (m == "wxLB_EXTENDED")

           controlItem->SetValue1(wxLB_EXTENDED);
           controlItem->SetValue1(wxLB_EXTENDED);

+*/
+       // Ignore the value

        count ++;
        count ++;

-        if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-       {
-          // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
+      }
+      if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
+      {
+         // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));

          count ++;
          count ++;

-          if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-            controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
-       }
-     }
+         if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
+           controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
+      }

    }
   }
   else if (controlType == "wxChoice")
    }
   }
   else if (controlType == "wxChoice")


@@ -2243,7 +2253,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
                          "Forgot to use wxResourceLoadIconData?"), (const char*) name);
           return (wxIcon *) NULL;
         }
                          "Forgot to use wxResourceLoadIconData?"), (const char*) name);
           return (wxIcon *) NULL;
         }

-        return wxIcon((char **)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3());
+        return wxIcon((const char **)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3());

 #else
         wxLogWarning(_("No XBM facility available!"));
 #endif
 #else
         wxLogWarning(_("No XBM facility available!"));
 #endif


@@ -2847,4 +2857,8 @@ wxControl *wxWindow::CreateItem(const wxItemResource *resource, const wxItemReso
   return table->CreateItem((wxWindow *)this, resource, parentResource);
 }
 
   return table->CreateItem((wxWindow *)this, resource, parentResource);
 }
 

+#ifdef _MSC_VER
+    #pragma warning(default:4706)   // assignment within conditional expression
+#endif // VC++
+

 #endif // wxUSE_WX_RESOURCES
 #endif // wxUSE_WX_RESOURCES