Fixed wxCheckBox on wxGTK (SetLabel called before widget creation),

[wxWidgets.git] / src / msw / registry.cpp

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index b2650bcb6bb876d8135668de6bf02bbe57d8ec8d..a2f1b268e973b31b854952959db104a0657c04a5 100644 (file)
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -887,11 +887,14 @@ bool GetFileTypeIcon(wxIcon *pIcon, const wxString& strFileType)
       // NB: icon index may be negative as well as positive and the full path
       //     may contain the environment variables inside '%'
       wxString strFullPath = strIcon.Before(','),
       // NB: icon index may be negative as well as positive and the full path
       //     may contain the environment variables inside '%'
       wxString strFullPath = strIcon.Before(','),

-               strIndex = strIcon.After(',');
+               strIndex = strIcon.Right(',');

 
 

-      // unless I misunderstand the format (may be index may be ommited, I
-      // don't know)
-      wxASSERT( !(strFullPath.IsEmpty() || strIndex.IsEmpty()) );
+      // index may be omitted, in which case Before(',') is empty and
+      // Right(',') is the whole string
+      if ( strFullPath.IsEmpty() ) {
+        strFullPath = strIndex;
+        strIndex = "0";
+      }

 
       wxString strExpPath = wxExpandEnvVars(strFullPath);
       int nIndex = atoi(strIndex);
 
       wxString strExpPath = wxExpandEnvVars(strFullPath);
       int nIndex = atoi(strIndex);