xavi
/
torque-ide
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated for wxWindows 2.6/2.7 

Changed wxSTC_MARKs for TorqueIDESTC
Updated linux/Makefile: "make clean" now properly deletes object files
This commit is contained in:
robertsim007 2006-08-29 03:34:50 +00:00
parent a3ef13dbcb
commit 108e66ab24
9 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
torque-ide/linux/Makefile
View File

@ -21,7 +21,7 @@ torqueide: $(OBJ)
$(CXX) $(LDFLAGS) -o ../$(BINARY) $(OBJ) $(LIBS)
clean:
rm -f ../*.o core $(BINARY)
rm -f ../src/*.o core $(BINARY)
v: clean all
valgrind ../$(BINARY)

8
torque-ide/src/torqueideabout.cpp
View File

@ -34,7 +34,7 @@
#include "torqueideabout.h"
TorqueIDEAbout::TorqueIDEAbout(wxWindow *parent)
: wxDialog(parent, -1, "About the Torque IDE", wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
: wxDialog(parent, -1, _("About the Torque IDE"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
{
SetAutoLayout(TRUE);
@ -44,7 +44,7 @@ TorqueIDEAbout::TorqueIDEAbout(wxWindow *parent)
layout->width.AsIs();
layout->height.AsIs();
aboutText = new wxStaticText(this, -1, "", wxPoint(-1, -1), wxDefaultSize, wxALIGN_CENTER);
aboutText = new wxStaticText(this, -1, _(""), wxPoint(-1, -1), wxDefaultSize, wxALIGN_CENTER);
aboutText->SetConstraints(layout);
layout = new wxLayoutConstraints();
@ -53,7 +53,7 @@ TorqueIDEAbout::TorqueIDEAbout(wxWindow *parent)
layout->width.PercentOf(this, wxWidth, 80);
layout->height.AsIs();
ok = new wxButton(this, wxID_OK, "Ok", wxPoint(-1, -1));
ok = new wxButton(this, wxID_OK, _("Ok"), wxPoint(-1, -1));
ok->SetConstraints(layout);
Layout();
@ -64,4 +64,4 @@ void TorqueIDEAbout::SetText(const wxString& text)
aboutText->SetLabel(text);
Layout(); // This command could have messed with the layout, so redo.
}
}

2
torque-ide/src/torqueideabout.h
View File

@ -50,4 +50,4 @@ class TorqueIDEAbout : public wxDialog
};
#endif
#endif

4
torque-ide/src/torqueideapp.cpp
View File

@ -45,7 +45,7 @@ IMPLEMENT_APP(TorqueIDEApp)
bool TorqueIDEApp::OnInit()
{
TorqueIDEFrame *frame = new TorqueIDEFrame("torque-ide");
TorqueIDEFrame *frame = new TorqueIDEFrame(_("torque-ide"));
#ifdef __WXMOTIF__
int width, height;
@ -67,4 +67,4 @@ int TorqueIDEApp::OnExit()
{
// TODO: Delete special global stuff here
return 0;
}
}

8
torque-ide/src/torqueideframe.cpp
View File

@ -61,7 +61,7 @@ TorqueIDEFrame::TorqueIDEFrame(const wxString &title) : wxFrame ((wxFrame *)NULL
scintilla->SetMarginType(0, 1); // set margin type to linenumbers
// Give the app our icon
SetIcon(wxIcon("torque")); // Does this mess with cross-platform abilities?
SetIcon(wxIcon(_("torque"))); // Does this mess with cross-platform abilities?
// StatusBar
InitStatusBar();
@ -194,7 +194,7 @@ void TorqueIDEFrame::OnMenuFileNew(wxCommandEvent &event)
void TorqueIDEFrame::OnMenuFileOpen(wxCommandEvent &event)
{
wxFileDialog *dlg = new wxFileDialog(this, _("Open"), "", "", _("TorqueSCRIPT Files(*.cs, *.gui, *.mis)|*.cs;*.gui;*.mis|All files(*.*)|*.*"), wxOPEN, wxDefaultPosition);
wxFileDialog *dlg = new wxFileDialog(this, _("Open"), _(""), _(""), _("TorqueSCRIPT Files(*.cs, *.gui, *.mis)|*.cs;*.gui;*.mis|All files(*.*)|*.*"), wxOPEN, wxDefaultPosition);
if(dlg->ShowModal() == wxID_OK)
{
scintilla->LoadFile(dlg->GetPath());
@ -214,7 +214,7 @@ void TorqueIDEFrame::OnMenuFileSave(wxCommandEvent &event)
void TorqueIDEFrame::OnMenuFileSaveAs(wxCommandEvent &event)
{
wxFileDialog *dlg = new wxFileDialog(this, _("Save As"), "", "", _("TorqueSCRIPT Files(*.cs)|*.cs|All files(*.*)|*.*"), wxSAVE, wxDefaultPosition);
wxFileDialog *dlg = new wxFileDialog(this, _("Save As"), _(""), _(""), _("TorqueSCRIPT Files(*.cs)|*.cs|All files(*.*)|*.*"), wxSAVE, wxDefaultPosition);
if(dlg->ShowModal() == wxID_OK)
{
scintilla->SaveFile(dlg->GetPath());
@ -331,4 +331,4 @@ void TorqueIDEFrame::OnMenuHelpAbout(wxCommandEvent &event)
TorqueIDEAbout *dlg = new TorqueIDEAbout(this);
dlg->SetText(_("Torque IDE\nAn Open Source Project\nReleased under the GPL v2\n\nTiff Support is:\nCopyright (c) 1988-1997 Sam Leffler\nCopyright (c) 1991-1997 Silicon Graphics, Inc.\n\nThis software is based in part on the work of the Independent JPEG Group"));
dlg->ShowModal();
}
}

2
torque-ide/src/torqueideprefs.cpp
View File

@ -425,4 +425,4 @@ const StyleInfo stylePrefs [] = {
};
const int stylePrefsSize = WXSIZEOF(stylePrefs);
const int stylePrefsSize = WXSIZEOF(stylePrefs);

2
torque-ide/src/torqueideprefs.h
View File

@ -142,4 +142,4 @@ struct StyleInfo {
extern const StyleInfo stylePrefs[];
extern const int stylePrefsSize;
#endif _TORQUEIDEPREFS_H
#endif _TORQUEIDEPREFS_H

16
torque-ide/src/torqueidestc.cpp
View File

@ -72,14 +72,14 @@ TorqueIDESTC::TorqueIDESTC(wxWindow *parent, wxWindowID id, const wxPoint &pos,
SetYCaretPolicy(wxSTC_CARET_EVEN|wxSTC_VISIBLE_STRICT|wxSTC_CARET_SLOP, 1);
// markers
MarkerDefine(wxSTC_MARKNUM_FOLDER, wxSTC_MARK_DOTDOTDOT, _T("BLACK"), _T("BLACK"));
MarkerDefine(wxSTC_MARKNUM_FOLDEROPEN, wxSTC_MARK_ARROWDOWN, _T("BLACK"), _T("BLACK"));
MarkerDefine(wxSTC_MARKNUM_FOLDERSUB, wxSTC_MARK_EMPTY, _T("BLACK"), _T("BLACK"));
MarkerDefine(wxSTC_MARKNUM_FOLDEREND, wxSTC_MARK_DOTDOTDOT, _T("BLACK"), _T("WHITE"));
MarkerDefine(wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_ARROWDOWN, _T("BLACK"), _T("WHITE"));
MarkerDefine(wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_EMPTY, _T("BLACK"), _T("BLACK"));
MarkerDefine(wxSTC_MARKNUM_FOLDERTAIL, wxSTC_MARK_EMPTY, _T("BLACK"), _T("BLACK"));
MarkerDefine(wxSTC_MARKNUM_FOLDEROPEN, wxSTC_MARK_CIRCLEMINUS);
MarkerDefine(wxSTC_MARKNUM_FOLDER, wxSTC_MARK_CIRCLEPLUS);
MarkerDefine(wxSTC_MARKNUM_FOLDERSUB, wxSTC_MARK_VLINE);
MarkerDefine(wxSTC_MARKNUM_FOLDERTAIL, wxSTC_MARK_LCORNERCURVE);
MarkerDefine(wxSTC_MARKNUM_FOLDEREND, wxSTC_MARK_CIRCLEPLUSCONNECTED);
MarkerDefine(wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_CIRCLEMINUSCONNECTED);
MarkerDefine(wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_TCORNERCURVE);
// miscelaneous
lineNumMargin = TextWidth(wxSTC_STYLE_LINENUMBER, _T("_999999"));
foldingMargin = 16;

4
torque-ide/src/torqueidestc.h
View File

@ -41,7 +41,7 @@ class TorqueIDESTC : public wxStyledTextCtrl
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = wxSUNKEN_BORDER|wxVSCROLL
);
);
/**
* Destructor
@ -83,4 +83,4 @@ class TorqueIDESTC : public wxStyledTextCtrl
DECLARE_EVENT_TABLE()
};
#endif _TORQUEIDESCINTILLA_H
#endif _TORQUEIDESCINTILLA_H