Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxID_ANY, wxDefaultSize, wxDefaultPosition, wxNOT_FOUND, true, false, tabs replacements.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-06-11 13:14:23 +00:00
parent df135587ad
commit f80ea77b4a
135 changed files with 1720 additions and 1720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
contrib/utils/convertrc/convert.cpp
View File

@@ -58,17 +58,17 @@ bool wxConvertApp::OnInit()
SetAppName(_T("wxConvertApp"));
if (HandleCommandLine())
return TRUE;
return true;
// Create the main frame window
m_pFrame = new wxMainFrame(NULL, -1, _T("wxConvertApp"), wxPoint(0, 0), wxSize(500, 400),
m_pFrame = new wxMainFrame(NULL, wxID_ANY, _T("wxConvertApp"), wxPoint(0, 0), wxSize(500, 400),
wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);
InitMenu();
m_pFrame->Show(TRUE);
m_pFrame->Show(true);
SetTopWindow(m_pFrame);
return TRUE;
return true;
}
void wxConvertApp::InitMenu()
@@ -122,7 +122,7 @@ wxMainFrame::~wxMainFrame()
void wxMainFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
Close(TRUE);
Close(true);
}
@@ -192,7 +192,7 @@ bool wxConvertApp::HandleCommandLine()
{
if (argc != 2)
return FALSE;
return false;
//Figure out kind of conversion
wxString source,target;
@@ -208,18 +208,18 @@ bool wxConvertApp::HandleCommandLine()
if ((source.Find(_T(".wxr"))>0)&&(target.Find(_T(".xml"))>0))
{
trans_wxr2xml.Convert(source,target);
return TRUE;
return true;
}
else if ((source.Find(_T(".rc"))!=-1)&(target.Find(_T(".wxr"))!=-1))
else if ((source.Find(_T(".rc"))!=wxNOT_FOUND)&(target.Find(_T(".wxr"))!=wxNOT_FOUND))
{
trans_rc2wxr.Convert(source,target);
return TRUE;
return true;
}
else if ((source.Find(_T(".rc"))!=-1)&(target.Find(_T(".xml"))!=-1))
else if ((source.Find(_T(".rc"))!=wxNOT_FOUND)&(target.Find(_T(".xml"))!=wxNOT_FOUND))
{
trans_rc2xml.Convert(source,target);
return TRUE;
return true;
}
return FALSE;
return false;
}

6
contrib/utils/convertrc/convert.h
View File

@@ -21,17 +21,17 @@ public:
void OnWXR2XML(wxCommandEvent& event);
void OnRc2Wxr(wxCommandEvent& event);
void OnQuit(wxCommandEvent& event);
wxMainFrame(wxWindow* parent, wxWindowID id,
wxMainFrame(wxWindow* parent, wxWindowID id,
const wxString& title, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = _T("frame"));
virtual ~wxMainFrame();
protected:
DECLARE_EVENT_TABLE()
};
class wxConvertApp : public wxApp
class wxConvertApp : public wxApp
{
public:
bool HandleCommandLine();

34
contrib/utils/convertrc/rc2wxr.cpp
View File

@@ -77,7 +77,7 @@ rc2wxr::rc2wxr()
{
m_done=FALSE;
m_done=false;
m_controlid=6000;
@@ -511,7 +511,7 @@ bool rc2wxr::Seperator(int ch)
if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='|'))
return TRUE;
return true;
@@ -519,13 +519,13 @@ if (ch==EOF)
{
m_done=TRUE;
m_done=true;
return TRUE;
return true;
}
return FALSE;
return false;
}
@@ -595,7 +595,7 @@ if (m_rc.Eof())
{
m_done=TRUE;
m_done=true;
return tok;
@@ -611,7 +611,7 @@ if (ch==EOF)
{
m_done=TRUE;
m_done=true;
return tok;
@@ -637,7 +637,7 @@ if (ch==EOF)
{
m_done=TRUE;
m_done=true;
@@ -663,7 +663,7 @@ ReadChar(ch);
if (ch==EOF)
m_done=TRUE;
m_done=true;
@@ -719,7 +719,7 @@ void rc2wxr::ReadChar(int &ch)
{
int result;
int result;
result=m_rc.Tell();
@@ -727,7 +727,7 @@ result=m_rc.Tell();
if((result>=m_filesize))
m_done=TRUE;
m_done=true;
@@ -737,13 +737,13 @@ result=m_rc.Read(&ch,1);
if((result==-1))
m_done=TRUE;
m_done=true;
if(ch==EOF)
m_done=TRUE;
m_done=true;
}
@@ -817,13 +817,13 @@ while ((tok!=_T("END"))&(tok!=_T("}")))
if (tok==_T("POPUP"))
{
{
ParsePopupMenu();
wxFprintf(m_wxr,_T(" ],\\\n"));
wxFprintf(m_wxr,_T(" ],\\\n"));
}
}
}
@@ -1043,7 +1043,7 @@ if (tok.IsNumber())
w=GetToken();
return TRUE;
return true;
}

2
contrib/utils/convertrc/rc2wxr.h
View File

@@ -8,7 +8,7 @@
#include "wx/file.h"
#include "stdio.h"
class rc2wxr : public wxObject
class rc2wxr : public wxObject
{
public:
rc2wxr();

88
contrib/utils/convertrc/rc2xml.cpp
View File

@@ -49,7 +49,7 @@ cross platform (wxGTK,etc)
rc2xml::rc2xml()
{
m_done=FALSE;
m_done=false;
m_bitmaplist=new wxList(wxKEY_STRING);
m_stringtable=new wxList(wxKEY_STRING);
m_iconlist = new wxList(wxKEY_STRING);
@@ -83,7 +83,7 @@ bool rc2xml::Convert(wxString rcfile, wxString xmlfile)
result=m_xmlfile.Open(xmlfile.c_str(),_T("w+t"));
wxASSERT_MSG(result,_T("Couldn't create XML file"));
if (!result)
return FALSE;
return false;
/* Write Basic header for XML file */
@@ -94,7 +94,7 @@ bool rc2xml::Convert(wxString rcfile, wxString xmlfile)
ParseResourceHeader();
//Gather all the resource we need for toolbars,menus, and etc
FirstPass();
m_done=FALSE;
m_done=false;
m_rc.Seek(0);
//Read in dialogs, toolbars,menus
SecondPass();
@@ -105,7 +105,7 @@ bool rc2xml::Convert(wxString rcfile, wxString xmlfile)
wxMessageBox(_("Conversion complete."), _("Done"),
wxOK | wxICON_INFORMATION);
return TRUE;
return true;
}
@@ -308,9 +308,9 @@ void rc2xml::ParseRadioButton(wxString phrase, wxString varname)
bool GotOrs;
GotOrs = ReadOrs(token);
if (ReadRect(x,y,width,height))
if (GotOrs==FALSE)
if (GotOrs==false)
ReadOrs(token);
if (token.Find(_T("WS_GROUP")) != -1)
if (token.Find(_T("WS_GROUP")) != wxNOT_FOUND)
style += _T("wxRB_GROUP");
m_xmlfile.Write(_T("\t\t<object class=\"wxRadioButton\""));
@@ -347,15 +347,15 @@ bool rc2xml::Seperator(int ch)
{
//if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='|')|(ch=='\t'))
if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='\t'))
return TRUE;
return true;
if (ch==EOF)
{
m_done=TRUE;
return TRUE;
m_done=true;
return true;
}
return FALSE;
return false;
}
void rc2xml::ParseGroupBox(wxString phrase, wxString varname)
@@ -394,7 +394,7 @@ wxString rc2xml::GetToken(bool *listseperator)
if (m_rc.Eof())
{
m_done=TRUE;
m_done=true;
return token;
}
@@ -402,7 +402,7 @@ wxString rc2xml::GetToken(bool *listseperator)
ReadChar(ch);
if (ch==EOF)
{
m_done=TRUE;
m_done=true;
return token;
}
@@ -415,7 +415,7 @@ wxString rc2xml::GetToken(bool *listseperator)
if (ch==EOF)
{
m_done=TRUE;
m_done=true;
}
@@ -426,7 +426,7 @@ wxString rc2xml::GetToken(bool *listseperator)
}
if (ch == EOF)
m_done = TRUE;
m_done = true;
if (listseperator)
*listseperator = (ch == ',');
@@ -458,14 +458,14 @@ wxString rc2xml::GetStringQuote()
{
wxString phrase;
//ASCII code 34 "
bool done=FALSE;
bool done=false;
int p,ch=0,lastch=0;
ReadChar(ch);
while (ch!=34)
ReadChar(ch);
ReadChar(ch);
while (done==FALSE)
while (done==false)
{
if ((ch==34)&&(lastch!='\\'))
{
@@ -477,10 +477,10 @@ wxString rc2xml::GetStringQuote()
else
{
m_rc.Seek(p);
done = TRUE;
done = true;
}
}
if (done==TRUE)
if (done==true)
break;
if (ch=='\r')
ReadChar(ch); // skip
@@ -501,15 +501,15 @@ void rc2xml::ReadChar(int &ch)
result=m_rc.Tell();
if((result>=m_filesize))
m_done=TRUE;
m_done=true;
result=m_rc.Read(&ch,1);
if((result==-1))
m_done=TRUE;
m_done=true;
if(ch==EOF)
m_done=TRUE;
m_done=true;
}
void rc2xml::ParseComboBox(wxString varname)
@@ -521,16 +521,16 @@ void rc2xml::ParseComboBox(wxString varname)
bool GotOrs;
GotOrs = ReadOrs(token);
if (ReadRect(x,y,width,height))
if (GotOrs==FALSE)
if (GotOrs==false)
ReadOrs(token);
m_xmlfile.Write(_T("\t\t<object class=\"wxComboBox\""));
WriteBasicInfo(x,y,width,height,varname);
if (token.Find(_T("CBS_SIMPLE")) != -1)
if (token.Find(_T("CBS_SIMPLE")) != wxNOT_FOUND)
WriteStyle(_T("wxCB_SIMPLE"));
if (token.Find(_T("CBS_SORT")) != -1)
if (token.Find(_T("CBS_SORT")) != wxNOT_FOUND)
WriteStyle(_T("wxCB_SORT"));
if (token.Find(_T("CBS_DISABLENOSCROLL")) != -1)
if (token.Find(_T("CBS_DISABLENOSCROLL")) != wxNOT_FOUND)
WriteStyle(_T("wxLB_ALWAYS_SB"));
m_xmlfile.Write(_T("\n\t\t</object>\n"));
@@ -631,7 +631,7 @@ void rc2xml::ParseSlider(wxString WXUNUSED(label), wxString varname)
{
wxString token,style;
ReadOrs(token);
if (token.Find(_T("TBS_VERT"))!=-1)
if (token.Find(_T("TBS_VERT"))!=wxNOT_FOUND)
style+=_T("wxSL_VERTICAL");
//MFC RC Default is horizontal
else
@@ -670,7 +670,7 @@ bool rc2xml::ReadOrs(wxString & orstring)
token=PeekToken();
if (token.IsNumber())
return FALSE;
return false;
orstring=GetToken();
while(PeekToken()==_T("|"))
@@ -680,7 +680,7 @@ bool rc2xml::ReadOrs(wxString & orstring)
//Grab next token
orstring+=GetToken();
}
return TRUE;
return true;
}
//Is it a checkbutton or a radiobutton or a pushbutton or a groupbox
@@ -692,15 +692,15 @@ void rc2xml::ParseCtrlButton(wxString label, wxString varname)
ReadOrs(token);
m_rc.Seek(p);
if (token.Find(_T("BS_AUTOCHECKBOX"))!=-1)
if (token.Find(_T("BS_AUTOCHECKBOX"))!=wxNOT_FOUND)
ParseCheckBox(label, varname);
else if ((token.Find(_T("BS_AUTORADIOBUTTON"))!=-1)||
(token.Find(_T("BS_RADIOBUTTON"))!=-1))
else if ((token.Find(_T("BS_AUTORADIOBUTTON"))!=wxNOT_FOUND)||
(token.Find(_T("BS_RADIOBUTTON"))!=wxNOT_FOUND))
ParseRadioButton(label, varname);
else if (token.Find(_T("BS_GROUPBOX"))!=-1)
else if (token.Find(_T("BS_GROUPBOX"))!=wxNOT_FOUND)
ParseGroupBox(label, varname);
else // if ((token.Find("BS_PUSHBUTTON")!=-1)||
// (token.Find("BS_DEFPUSHBUTTON")!=-1))
else // if ((token.Find("BS_PUSHBUTTON")!=wxNOT_FOUND)||
// (token.Find("BS_DEFPUSHBUTTON")!=wxNOT_FOUND))
ParsePushButton(label, varname); // make default case
}
@@ -846,7 +846,7 @@ void rc2xml::ParseSpinCtrl(wxString WXUNUSED(label), wxString varname)
wxString token,style;
ReadOrs(token);
if (token.Find(_T("UDS_HORZ"))!=-1)
if (token.Find(_T("UDS_HORZ"))!=wxNOT_FOUND)
style=_T("wxSP_HORIZONTAL");
//MFC default
else
@@ -928,7 +928,7 @@ void rc2xml::ParseToolBar(wxString varname)
wxLogError(_T("Unable to load bitmap:")+*bitmappath);
//Write toolbar to xml file
m_xmlfile.Write(_T(" <object class=\"wxToolBar\""));
m_xmlfile.Write(_T("\t<object class=\"wxToolBar\""));
//Avoid duplicate names this way
varname.Replace(_T("IDR_"),_T("TB_"));
WriteName(varname);
@@ -962,7 +962,7 @@ void rc2xml::ParseToolBar(wxString varname)
{
SplitHelp(msg,tip,longhelp);
m_xmlfile.Write(_T("\t\t\t\t<tooltip>")+tip+_T("</tooltip>\n"));
m_xmlfile.Write(_T(" <longhelp>")+longhelp+_T("</longhelp>\n"));
m_xmlfile.Write(_T("\t\t<longhelp>")+longhelp+_T("</longhelp>\n"));
}
//Make a bitmap file name
buttonname=CleanName(buttonname);
@@ -1016,19 +1016,19 @@ bool rc2xml::LookUpString(wxString strid,wxString & st)
wxNode *node=m_stringtable->Find(strid);
wxString *s;
if (node==NULL)
return FALSE;
return false;
s=(wxString *)node->GetData();
st=*s;
return TRUE;
return true;
}
bool rc2xml::SplitHelp(wxString msg, wxString &shorthelp, wxString &longhelp)
{
int spot;
spot=msg.Find(_T("\\n"));
if (spot==-1)
if (spot==wxNOT_FOUND)
{
shorthelp=msg;
longhelp=msg;
@@ -1037,7 +1037,7 @@ bool rc2xml::SplitHelp(wxString msg, wxString &shorthelp, wxString &longhelp)
longhelp=msg.Left(spot);
spot=msg.Length()-spot-2;
shorthelp=msg.Right(spot);
return TRUE;
return true;
}
void rc2xml::ParseMenuItem()
@@ -1191,7 +1191,7 @@ kindctrl.MakeUpper();
int p=m_rc.Tell();
ReadOrs(token);
m_rc.Seek(p);
if (token.Find(_T("SS_BITMAP"))!=-1)
if (token.Find(_T("SS_BITMAP"))!=wxNOT_FOUND)
ParseStaticBitmap(label,varname);
else
ParseStaticText(label,varname);
@@ -1238,7 +1238,7 @@ void rc2xml::ParseScrollBar()
ReadOrs(token);
if (token.Find(_T("SBS_VERT"))!=-1)
if (token.Find(_T("SBS_VERT"))!=wxNOT_FOUND)
style=_T("wxSB_VERTICAL");
//Default MFC style is horizontal
else
@@ -1377,7 +1377,7 @@ wxTextFile r;
//Read through entire file
for ( str = r.GetFirstLine(); !r.Eof(); str = r.GetNextLine() )
{
if (str.Find(_T("#define"))!=-1)
if (str.Find(_T("#define"))!=wxNOT_FOUND)
{
tok.SetString(str);
//Just ignore #define token

8
contrib/utils/convertrc/rc2xml.h
View File

@@ -10,7 +10,7 @@
#include <wx/list.h>
class rc2xml : public wxObject
class rc2xml : public wxObject
{
public:
wxString m_workingpath;
@@ -22,8 +22,8 @@ public:
~rc2xml();
protected:
wxString LookUpId(wxString id);
wxString LookUpId(wxString id);
void ParseResourceHeader();
void WriteBitmap(wxString bitmapname);
void ParseListCtrl(wxString label,wxString varname);
@@ -37,7 +37,7 @@ protected:
wxList * m_iconlist;
void ParseIconStatic();
void ParseMenuItem();
//Functions
bool SplitHelp(wxString msg, wxString &shorthelp, wxString &longhelp);
bool LookUpString(wxString strid,wxString & st);

54
contrib/utils/convertrc/wxr2xml.cpp
View File

@@ -48,12 +48,12 @@ bool wxr2xml::Convert(wxString wxrfile, wxString xmlfile)
result = m_xmlfile.Open(xmlfile.c_str(), _T("w+t"));
wxASSERT_MSG(result, _T("Couldn't create XML file"));
if (!result)
return FALSE;
return false;
result = m_table.ParseResourceFile(wxrfile);
wxASSERT_MSG(result, _T("Couldn't Load WXR file"));
if (!result)
return FALSE;
return false;
// Write basic xml header
m_xmlfile.Write(_T("<?xml version=\"1.0\" ?>\n"));
m_xmlfile.Write(_T("<resource>\n"));
@@ -71,7 +71,7 @@ bool wxr2xml::ParseResources()
wxHashTable::Node *node;
node = m_table.Next();
while (node)
while (node)
{
wxItemResource *res = (wxItemResource *) node->GetData();
wxString resType(res->GetType());
@@ -89,7 +89,7 @@ bool wxr2xml::ParseResources()
wxLogError(_T("Found unsupported resource ") + resType);
node = m_table.Next();
}
return TRUE;
return true;
}
void wxr2xml::ParsePanel(wxItemResource * res)
@@ -117,7 +117,7 @@ void wxr2xml::ParseDialog(wxItemResource * res)
void wxr2xml::ParseControls(wxItemResource * res)
{
wxNode *node = res->GetChildren().GetFirst();
while (node)
while (node)
{
wxItemResource *res = (wxItemResource *) node->GetData();
wxString resType(res->GetType());
@@ -405,7 +405,7 @@ wxString wxr2xml::GetStyles(wxItemResource * res)
if (style & wxNO_FULL_REPAINT_ON_RESIZE)
s += _T("wxNO_FULL_REPAINT_ON_RESIZE|");
if (restype == _T("wxDialog"))
if (restype == _T("wxDialog"))
{
if (style & wxDIALOG_MODAL)
s += _T("wxDIALOG_MODAL|");
@@ -435,7 +435,7 @@ wxString wxr2xml::GetStyles(wxItemResource * res)
s += _T("wxCLIP_CHILDREN|");
}
if (restype == _T("wxPanel"))
if (restype == _T("wxPanel"))
{
if (style & wxCLIP_CHILDREN)
s += _T("wxCLIP_CHILDREN|");
@@ -447,7 +447,7 @@ wxString wxr2xml::GetStyles(wxItemResource * res)
s += _T("wxWS_EX_VALIDATE_RECURSIVELY|");
}
if (restype == _T("wxComboBox"))
if (restype == _T("wxComboBox"))
{
if (style & wxCB_SORT)
s += _T("wxCB_SORT|");
@@ -459,7 +459,7 @@ wxString wxr2xml::GetStyles(wxItemResource * res)
s += _T("wxCB_DROPDOWN|");
}
if (restype == _T("wxGauge"))
if (restype == _T("wxGauge"))
{
if (style & wxGA_HORIZONTAL)
s += _T("wxGA_HORIZONTAL|");
@@ -472,19 +472,19 @@ wxString wxr2xml::GetStyles(wxItemResource * res)
s += _T("wxGA_SMOOTH|");
}
if (restype == _T("wxRadioButton"))
if (restype == _T("wxRadioButton"))
{
if (style & wxRB_GROUP)
s += _T("wxRB_GROUP|");
}
if (restype == _T("wxStaticText"))
if (restype == _T("wxStaticText"))
{
if (style & wxST_NO_AUTORESIZE)
s += _T("wxST_NO_AUTORESIZEL|");
}
if (restype == _T("wxRadioBox"))
if (restype == _T("wxRadioBox"))
{
if (style & wxRA_HORIZONTAL)
s += _T("wxRA_HORIZONTAL|");
@@ -496,7 +496,7 @@ wxString wxr2xml::GetStyles(wxItemResource * res)
s += _T("wxRA_VERTICAL|");
}
if (restype == _T("wxListBox"))
if (restype == _T("wxListBox"))
{
if (style & wxLB_SINGLE)
s += _T("wxLB_SINGLE|");
@@ -514,7 +514,7 @@ wxString wxr2xml::GetStyles(wxItemResource * res)
s += _T("wxLB_SORT|");
}
if (restype == _T("wxTextCtrl"))
if (restype == _T("wxTextCtrl"))
{
if (style & wxTE_PROCESS_ENTER)
s += _T("wxTE_PROCESS_ENTER|");
@@ -535,7 +535,7 @@ wxString wxr2xml::GetStyles(wxItemResource * res)
{
if (style & wxSB_HORIZONTAL)
s += _T("wxSB_HORIZONTAL|");
if (style & wxSB_VERTICAL)
if (style & wxSB_VERTICAL)
s += _T("wxSB_VERTICAL|");
}
@@ -598,7 +598,7 @@ void wxr2xml::ParseMenu(wxItemResource * res)
{
wxItemResource *child;
wxNode *node = res->GetChildren().GetFirst();
// Get Menu
// Get Menu
m_xmlfile.Write(_T("\t\t\t<object class=\"wxMenu\" "));
wxString menuname;
menuname << _T("name = \"menu_") << res->GetValue1() << _T("\"");
@@ -632,10 +632,10 @@ void wxr2xml::ParseMenuItem(wxItemResource * res)
menuname << _T("name = \"menuitem_") << res->GetValue1() << _T("\"");
m_xmlfile.Write(menuname);
m_xmlfile.Write(_T(">\n"));
m_xmlfile.Write(_T(" <label>")
m_xmlfile.Write(_T("\t\t\t<label>")
+ FixMenuString(res->GetTitle()) + _T("</label>\n"));
if (res->GetValue4() != _T(""))
m_xmlfile.Write(_T(" <help>") +
m_xmlfile.Write(_T("\t\t\t<help>") +
res->GetValue4() + _T("</help>\n"));
if (res->GetValue2())
m_xmlfile.Write(_T("\t\t\t\t<checkable>1</checkable>\n"));
@@ -682,16 +682,16 @@ void wxr2xml::ParseBitmap(wxItemResource * res)
void wxr2xml::PanelStuff(wxItemResource * res)
{
if ((res->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) != 0)
m_dlgunits = TRUE;
m_dlgunits = true;
else
m_dlgunits = FALSE;
m_dlgunits = false;
// If this is true ignore fonts, background color and use system
// defaults instead
if ((res->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)
m_systemdefaults = TRUE;
m_systemdefaults = true;
else
m_systemdefaults = FALSE;
m_systemdefaults = false;
}
@@ -720,7 +720,7 @@ wxString wxr2xml::GetValue5(wxItemResource *res)
void wxr2xml::ParseBitmapButton(wxItemResource *res)
{
m_xmlfile.Write(_T("\t\t\t<object class=\"wxBitmapButton\""));
WriteControlInfo(res);
// value4 holds bitmap name
@@ -731,7 +731,7 @@ void wxr2xml::ParseBitmapButton(wxItemResource *res)
bitmapname += _T(".bmp");
bitmap.SaveFile(bitmapname, wxBITMAP_TYPE_BMP);
m_xmlfile.Write(_T("\t\t\t\t<bitmap>") + bitmapname + _T("</bitmap>\n"));
m_xmlfile.Write(_T("\t\t\t</object>\n"));
}
@@ -755,10 +755,10 @@ void wxr2xml::WriteFontInfo(wxItemResource *res)
GetFontFace(font);
GetFontStyle(font);
GetFontWeight(font);
if (font.GetUnderlined())
m_xmlfile.Write(_T("\t\t\t\t<underlined>1</underlined>\n"));
m_xmlfile.Write(_T("\t\t\t</font>\n"));
}
@@ -767,7 +767,7 @@ void wxr2xml::WriteFontInfo(wxItemResource *res)
void wxr2xml::GetFontFace(wxFont font)
{
int family=font.GetFamily();
switch (family)
{
case wxDEFAULT: