Fixed doubled-up key effects in wxTextCtrl by resetting m_lastMsg to 0

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

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index f31d3ae392282bd97666db10d9417c925dba39d8..ac44cbc88210254f9bdd79d59af48743ff515df7 100644 (file)
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -22,7 +22,7 @@
 
 #if wxUSE_WX_RESOURCES
 
 
 #if wxUSE_WX_RESOURCES
 

-#ifdef _MSC_VER
+#ifdef __VISUALC__

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


@@ -39,12 +39,14 @@
 #include "wx/button.h"
 #include "wx/bmpbuttn.h"
 #include "wx/radiobox.h"
 #include "wx/button.h"
 #include "wx/bmpbuttn.h"
 #include "wx/radiobox.h"

+#include "wx/radiobut.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"
 #include "wx/listbox.h"
 #include "wx/choice.h"
 #include "wx/checkbox.h"
 #include "wx/settings.h"
 #include "wx/slider.h"
 #include "wx/statbox.h"

+#include "wx/statbmp.h"

 #if wxUSE_GAUGE
 #include "wx/gauge.h"
 #endif
 #if wxUSE_GAUGE
 #include "wx/gauge.h"
 #endif


@@ -53,6 +55,10 @@
 #include "wx/intl.h"
 #endif
 
 #include "wx/intl.h"
 #endif
 

+#if wxUSE_RADIOBUTTON
+#include "wx/radiobut.h"
+#endif
+

 #if wxUSE_SCROLLBAR
 #include "wx/scrolbar.h"
 #endif
 #if wxUSE_SCROLLBAR
 #include "wx/scrolbar.h"
 #endif


@@ -93,10 +99,10 @@ bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table = (wxR
 
 wxResourceTable *wxDefaultResourceTable = (wxResourceTable *) NULL;
 
 
 wxResourceTable *wxDefaultResourceTable = (wxResourceTable *) NULL;
 

-static char *wxResourceBuffer = (char *) NULL;
-static long wxResourceBufferSize = 0;
-static long wxResourceBufferCount = 0;
-static int wxResourceStringPtr = 0;
+char *wxResourceBuffer = (char *) NULL;
+long wxResourceBufferSize = 0;
+long wxResourceBufferCount = 0;
+int wxResourceStringPtr = 0;

 
 void wxInitializeResourceSystem()
 {
 
 void wxInitializeResourceSystem()
 {


@@ -553,17 +559,33 @@ bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db)
   return TRUE;
 }
 
   return TRUE;
 }
 

-static char *g_ValidControlClasses[] = { "wxButton", "wxBitmapButton", "wxMessage",
- "wxStaticText", "wxStaticBitmap", "wxText", "wxTextCtrl", "wxMultiText",
- "wxListBox", "wxRadioBox", "wxRadioButton", "wxCheckBox", "wxBitmapCheckBox",
- "wxGroupBox", "wxStaticBox", "wxSlider", "wxGauge", "wxScrollBar",
- "wxChoice", "wxComboBox" } ;
-static int g_ValidControlClassesCount = sizeof(g_ValidControlClasses) / sizeof(char *) ;
+static const char *g_ValidControlClasses[] =
+{
+    "wxButton",
+    "wxBitmapButton",
+    "wxMessage",
+    "wxStaticText",
+    "wxStaticBitmap",
+    "wxText",
+    "wxTextCtrl",
+    "wxMultiText",
+    "wxListBox",
+    "wxRadioBox",
+    "wxRadioButton",
+    "wxCheckBox",
+    "wxBitmapCheckBox",
+    "wxGroupBox",
+    "wxStaticBox",
+    "wxSlider",
+    "wxGauge",
+    "wxScrollBar",
+    "wxChoice",
+    "wxComboBox"
+};

 
 static bool wxIsValidControlClass(const wxString& c)
 {
 
 static bool wxIsValidControlClass(const wxString& c)
 {

-   int i;
-   for ( i = 0; i < g_ValidControlClassesCount; i++)
+   for ( size_t i = 0; i < WXSIZEOF(g_ValidControlClasses); i++ )

    {
       if ( c == g_ValidControlClasses[i] )
          return TRUE;
    {
       if ( c == g_ValidControlClasses[i] )
          return TRUE;


@@ -797,6 +819,23 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
   controlItem->SetId(id);
 
   if (controlType == "wxButton")
   controlItem->SetId(id);
 
   if (controlType == "wxButton")

+  {
+    // Check for bitmap resource name (in case loading old-style resource file)
+    if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
+    {
+        wxString str(expr->Nth(count)->StringValue());
+        count ++;
+
+        if (str != "")
+        {
+            controlItem->SetValue4(str);
+            controlItem->SetType("wxBitmapButton");
+        }
+    }
+    if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
+      controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
+  }
+  else if (controlType == "wxBitmapButton")

   {
     // Check for bitmap resource name
     if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
   {
     // Check for bitmap resource name
     if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))


@@ -852,6 +891,19 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
    }
   }
   else if (controlType == "wxMessage" || controlType == "wxStaticText")
    }
   }
   else if (controlType == "wxMessage" || controlType == "wxStaticText")

+  {
+    // Check for bitmap resource name (in case it's an old-style .wxr file)
+    if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
+    {
+      wxString str(expr->Nth(count)->StringValue());
+      controlItem->SetValue4(str);
+      count ++;
+      controlItem->SetType("wxStaticText");
+    }
+    if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
+      controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
+  }
+  else if (controlType == "wxStaticBitmap")

   {
     // Check for bitmap resource name
     if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
   {
     // Check for bitmap resource name
     if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))


@@ -859,9 +911,9 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
       wxString str(expr->Nth(count)->StringValue());
       controlItem->SetValue4(str);
       count ++;
       wxString str(expr->Nth(count)->StringValue());
       controlItem->SetValue4(str);
       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 == "wxGroupBox" || controlType == "wxStaticBox")
   {
   }
   else if (controlType == "wxGroupBox" || controlType == "wxStaticBox")
   {


@@ -1291,18 +1343,18 @@ wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), wxEx
           wxExpr *coloursExpr = listExpr->Nth(3);
           wxExpr *xresExpr = listExpr->Nth(4);
           wxExpr *yresExpr = listExpr->Nth(5);
           wxExpr *coloursExpr = listExpr->Nth(3);
           wxExpr *xresExpr = listExpr->Nth(4);
           wxExpr *yresExpr = listExpr->Nth(5);

-          if (nameExpr && nameExpr->StringValue())
+          if (nameExpr && nameExpr->StringValue() != "")

           {
             bitmapSpec->SetName(nameExpr->StringValue());
           }
           {
             bitmapSpec->SetName(nameExpr->StringValue());
           }

-          if (typeExpr && typeExpr->StringValue())
+          if (typeExpr && typeExpr->StringValue() != "")

           {
             bitmapSpec->SetValue1(wxParseWindowStyle(typeExpr->StringValue()));
           }
           else
             bitmapSpec->SetValue1(0);
 
           {
             bitmapSpec->SetValue1(wxParseWindowStyle(typeExpr->StringValue()));
           }
           else
             bitmapSpec->SetValue1(0);
 

-          if (platformExpr && platformExpr->StringValue())
+          if (platformExpr && platformExpr->StringValue() != "")

           {
             wxString plat(platformExpr->StringValue());
             if (plat == "windows" || plat == "WINDOWS")
           {
             wxString plat(platformExpr->StringValue());
             if (plat == "windows" || plat == "WINDOWS")


@@ -1397,6 +1449,9 @@ wxFont wxResourceInterpretFontSpec(wxExpr *expr)
   return font;
 }
 
   return font;
 }
 

+// Separate file for the remainder of this, for BC++/Win16
+
+#if !((defined(__BORLANDC__) || defined(__SC__)) && defined(__WIN16__))

 /*
  * (Re)allocate buffer for reading in from resource file
  */
 /*
  * (Re)allocate buffer for reading in from resource file
  */


@@ -1744,6 +1799,8 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
 
   /* wxRadioBox/wxRadioButton */
   { "wxRB_GROUP", wxRB_GROUP },
 
   /* wxRadioBox/wxRadioButton */
   { "wxRB_GROUP", wxRB_GROUP },

+  { "wxRA_SPECIFY_COLS", wxRA_SPECIFY_COLS },
+  { "wxRA_SPECIFY_ROWS", wxRA_SPECIFY_ROWS },

   { "wxRA_HORIZONTAL", wxRA_HORIZONTAL },
   { "wxRA_VERTICAL", wxRA_VERTICAL },
 
   { "wxRA_HORIZONTAL", wxRA_HORIZONTAL },
   { "wxRA_VERTICAL", wxRA_VERTICAL },
 


@@ -1999,7 +2056,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
   wxItemResource *item = table->FindResource(resource);
   if (item)
   {
   wxItemResource *item = table->FindResource(resource);
   if (item)
   {

-    if (!item->GetType() || strcmp(item->GetType(), "wxBitmap") != 0)
+    if ((item->GetType() == "") || (item->GetType() != "wxBitmap"))

     {
       wxLogWarning(_("%s not a bitmap resource specification."), (const char*) resource);
       return wxNullBitmap;
     {
       wxLogWarning(_("%s not a bitmap resource specification."), (const char*) resource);
       return wxNullBitmap;


@@ -2120,7 +2177,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
                          "Forgot to use wxResourceLoadBitmapData?"), (const char*) name);
           return wxNullBitmap;
         }
                          "Forgot to use wxResourceLoadBitmapData?"), (const char*) name);
           return wxNullBitmap;
         }

-        return wxBitmap(item->GetValue1());
+        return wxBitmap((char **)item->GetValue1());

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


@@ -2777,8 +2834,8 @@ bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName,
 
   wxItemResource *resource = table->FindResource((const char *)resourceName);
 //  if (!resource || (resource->GetType() != wxTYPE_DIALOG_BOX))
 
   wxItemResource *resource = table->FindResource((const char *)resourceName);
 //  if (!resource || (resource->GetType() != wxTYPE_DIALOG_BOX))

-  if (!resource || !resource->GetType() ||
-    ! ((strcmp(resource->GetType(), "wxDialog") == 0) || (strcmp(resource->GetType(), "wxPanel") == 0)))
+  if (!resource || (resource->GetType() == "") ||
+    ! ((resource->GetType() == "wxDialog") || (resource->GetType() == "wxPanel")))

     return FALSE;
 
   wxString title(resource->GetTitle());
     return FALSE;
 
   wxString title(resource->GetTitle());


@@ -2863,8 +2920,11 @@ 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
+#ifdef __VISUALC__

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

+#endif
+  // BC++/Win16
+

 #endif // wxUSE_WX_RESOURCES
 #endif // wxUSE_WX_RESOURCES