include wx/msw/private.h before wx/msw/uxtheme.h for consistency with other headers...

[wxWidgets.git] / contrib / utils / convertrc / rc2wxr.cpp

diff --git a/contrib/utils/convertrc/rc2wxr.cpp b/contrib/utils/convertrc/rc2wxr.cpp
index 4a6944141382a3e700d9796d189ea8f26491fcb2..4a44fb84c8e72573b472b28e2a88b7a04fb5ceb1 100644 (file)
--- a/contrib/utils/convertrc/rc2wxr.cpp
+++ b/contrib/utils/convertrc/rc2wxr.cpp
@@ -10,11 +10,6 @@ not be used much longer.
 This code was used as a starting point for my rc2xml converter
 */
 
-#ifdef __GNUG__
-#pragma implementation "rc2wxr.cpp"
-#pragma interface "rc2wxr.cpp"
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -158,7 +153,7 @@ wxFprintf(m_wxr,_T("static char *dialog%i = \"dialog(name = '%s',\\\n"),dlgid,dl
 
 //be lazy about style for now. add it later
 
-wxFprintf(m_wxr,_T("style = 'wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU',\\\n"));
+wxFprintf(m_wxr,_T("style = 'wxRAISED_BORDER | wxCAPTION | wxRESIZE_BORDER | wxSYSTEM_MENU',\\\n"));
 wxFprintf(m_wxr,_T("id = %i,\\\n"),dlgid);
 
 //Record x,y,width,height
@@ -400,7 +395,7 @@ wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],
 
 
 
-bool rc2wxr::Seperator(int ch)
+bool rc2wxr::Separator(int ch)
 
 {
 
@@ -514,7 +509,7 @@ return tok;
 
 
 
-while (Seperator(ch))
+while (Separator(ch))
 
 {
 
@@ -542,7 +537,7 @@ m_done=true;
 
 
 
-while (!Seperator(ch))
+while (!Separator(ch))
 
 {
 
@@ -800,4 +795,3 @@ void rc2wxr::ParseCtrlButton(wxString label, wxString varname)
         wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"));
     }
 }
-