diff options
| author | Giuseppe Baruffa <gbaruffa@users.noreply.github.com> | 2007-03-29 08:27:03 +0000 |
|---|---|---|
| committer | Giuseppe Baruffa <gbaruffa@users.noreply.github.com> | 2007-03-29 08:27:03 +0000 |
| commit | a1fe5809a4760ed2aa64951c596156f48fca393e (patch) | |
| tree | 68066e08142f30f5e9ad07e24f40d60f779b6bf3 /OPJViewer/source/OPJViewer.cpp | |
| parent | 5a3c1ffe7d5b4269d073fa826cba94591c0c3ed5 (diff) | |
Some coding style adaptations for compiling the OPJViewer GUI under Linux. It compiles, but does not yet display images.
Diffstat (limited to 'OPJViewer/source/OPJViewer.cpp')
| -rw-r--r-- | OPJViewer/source/OPJViewer.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OPJViewer/source/OPJViewer.cpp b/OPJViewer/source/OPJViewer.cpp index ea075dcc..d796fbb2 100644 --- a/OPJViewer/source/OPJViewer.cpp +++ b/OPJViewer/source/OPJViewer.cpp @@ -136,8 +136,9 @@ bool OPJViewerApp::OnInit(void) wxChar **wxArgv = new wxChar *[argc + 1];
- for (int n = 0; n < argc; n++ ) {
- wxMB2WXbuf warg = wxConvertMB2WX(argv[n]);
+ int n;
+ for (n = 0; n < argc; n++ ) {
+ wxMB2WXbuf warg = wxConvertMB2WX((char *) argv[n]);
wxArgv[n] = wxStrdup(warg);
}
@@ -570,7 +571,7 @@ void OPJFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) wxHtmlWindow *html;
wxDialog dlg(this, wxID_ANY, wxString(_("About")));
- wxMemoryFSHandler::AddFile("opj_logo.xpm", wxBitmap(opj_logo), wxBITMAP_TYPE_XPM);
+ wxMemoryFSHandler::AddFile(wxT("opj_logo.xpm"), wxBitmap(opj_logo), wxBITMAP_TYPE_XPM);
topsizer = new wxBoxSizer(wxVERTICAL);
@@ -1304,7 +1305,7 @@ void OPJMarkerTree::OnItemExpanding(wxTreeEvent& event) else
text = wxT("invalid item");
- if (strcmp(data->GetDesc1(), wxT("INFO-CSTREAM")))
+ if (wxStrcmp(data->GetDesc1(), wxT("INFO-CSTREAM")))
return;
wxLogMessage(wxT("Expanding... (%s -> %s, %s, %d, %d)"),
@@ -1364,7 +1365,7 @@ void OPJMarkerTree::OnSelChanged(wxTreeEvent& event) text << wxT(" ");
if (pos < max_read) {
- text << wxString::Format(wxT("%02X "), wxT(buffer[pos]));
+ text << wxString::Format(wxT("%02X "), buffer[pos]);
} else
text << wxT(" ");
pos++;
|