Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 187422 | Differences between
and this patch

Collapse All | Expand All

(-)beid-2.6.0/SConstruct.orig (-1 / +1 lines)
Lines 91-97 Link Here
91
        Exit(1)
91
        Exit(1)
92
92
93
    # check for wx libs
93
    # check for wx libs
94
    if conf.CheckLib('wx_gtk-2.4') or conf.CheckLib('wx_gtk2u_core-2.6') or conf.CheckLib('wx_gtk2-2.4') or conf.CheckLib('wx_gtk2_core-2.6'):
94
    if conf.CheckLib('wx_gtk-2.4') or conf.CheckLib('wx_gtk2u_core-2.6') or conf.CheckLib('wx_gtk2-2.4') or conf.CheckLib('wx_gtk2_core-2.6') or conf.CheckLib('wx_gtk2u_core-2.8') :
95
        env['WITHEIDGUI']=1
95
        env['WITHEIDGUI']=1
96
96
97
    # check for headers
97
    # check for headers
(-)beid-2.6.0/src/eidviewer/eidviewerApp.cpp.orig (-2 / +2 lines)
Lines 796-802 Link Here
796
796
797
        wxString strFileName(idData.nationalNumber, wxConvUTF8);
797
        wxString strFileName(idData.nationalNumber, wxConvUTF8);
798
        strFileName += wxT(".eid");
798
        strFileName += wxT(".eid");
799
        wxFileDialog oDialog(m_pFrame, _("Save an eID file"), wxT(""), strFileName, wxT("eID files (*.eid)|*.eid"), wxSAVE | wxHIDE_READONLY | wxOVERWRITE_PROMPT);
799
        wxFileDialog oDialog(m_pFrame, _("Save an eID file"), wxT(""), strFileName, wxT("eID files (*.eid)|*.eid"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
800
        if (oDialog.ShowModal() != wxID_OK)
800
        if (oDialog.ShowModal() != wxID_OK)
801
        {
801
        {
802
            m_pFrame->SetStatusText(wxT(""));
802
            m_pFrame->SetStatusText(wxT(""));
Lines 864-870 Link Here
864
864
865
    if(strFile.IsEmpty())
865
    if(strFile.IsEmpty())
866
    {
866
    {
867
        wxFileDialog oDialog(m_pFrame, _("Open an eID file"), wxT(""), wxT(""), wxT("eID files (*.eid)|*.eid"), wxOPEN | wxHIDE_READONLY);
867
        wxFileDialog oDialog(m_pFrame, _("Open an eID file"), wxT(""), wxT(""), wxT("eID files (*.eid)|*.eid"), wxFD_OPEN);
868
        if (oDialog.ShowModal() != wxID_OK)
868
        if (oDialog.ShowModal() != wxID_OK)
869
        {
869
        {
870
            m_pFrame->SetStatusText(wxT(""));
870
            m_pFrame->SetStatusText(wxT(""));
(-)beid-2.6.0/src/eidviewer/eidviewerFrame.cpp.orig (-7 / +7 lines)
Lines 108-114 Link Here
108
       : wxFrame(NULL, -1, title, wxPoint(x, y), wxSize(width, height), wxDEFAULT_FRAME_STYLE)
108
       : wxFrame(NULL, -1, title, wxPoint(x, y), wxSize(width, height), wxDEFAULT_FRAME_STYLE)
109
{
109
{
110
     m_notebook = NULL;
110
     m_notebook = NULL;
111
     m_sizerNotebook = NULL;
111
//     m_sizerNotebook = NULL;
112
     m_statusGauge = NULL;
112
     m_statusGauge = NULL;
113
     m_IDPanel = NULL;
113
     m_IDPanel = NULL;
114
114
Lines 133-139 Link Here
133
    SetToolBar(m_tbar);
133
    SetToolBar(m_tbar);
134
    
134
    
135
    m_notebook = new eidviewerNotebook(this, -1);
135
    m_notebook = new eidviewerNotebook(this, -1);
136
    m_sizerNotebook = new wxNotebookSizer( m_notebook );
136
//    m_sizerNotebook = new wxNotebookSizer( m_notebook );
137
    m_IDPanel = m_notebook->CreatePage(IDD_PAGE_IDENTITY);
137
    m_IDPanel = m_notebook->CreatePage(IDD_PAGE_IDENTITY);
138
    m_notebook->CreatePage(IDD_PAGE_CERTIFICATES);
138
    m_notebook->CreatePage(IDD_PAGE_CERTIFICATES);
139
    m_notebook->CreatePage(IDD_PAGE_CARDDATA);
139
    m_notebook->CreatePage(IDD_PAGE_CARDDATA);
Lines 169-179 Link Here
169
169
170
eidviewerFrame::~eidviewerFrame()
170
eidviewerFrame::~eidviewerFrame()
171
{
171
{
172
    if(m_sizerNotebook)
172
//    if(m_sizerNotebook)
173
    {
173
//    {
174
        delete m_sizerNotebook;
174
//        delete m_sizerNotebook;
175
        m_sizerNotebook = NULL;
175
//        m_sizerNotebook = NULL;
176
    }
176
//    }
177
}
177
}
178
178
179
void eidviewerFrame::OnQuit (wxCommandEvent & )
179
void eidviewerFrame::OnQuit (wxCommandEvent & )
(-)beid-2.6.0/src/eidviewer/eidviewerFrame.h.orig (-1 / +1 lines)
Lines 36-42 Link Here
36
private:
36
private:
37
    eidviewerNotebook *m_notebook;
37
    eidviewerNotebook *m_notebook;
38
    // Sizer for m_notebook
38
    // Sizer for m_notebook
39
    wxNotebookSizer *m_sizerNotebook;
39
//    wxNotebookSizer *m_sizerNotebook;
40
    wxPanel *m_IDPanel;
40
    wxPanel *m_IDPanel;
41
    bool m_bReading;
41
    bool m_bReading;
42
42
(-)beid-2.6.0/src/eidviewer/eidviewerNotebook.h.orig (+1 lines)
Lines 14-20 Link Here
14
#endif
14
#endif
15
15
16
#include "wx/notebook.h"
16
#include "wx/notebook.h"
17
#include "wx/treectrl.h"
17
#include "wx/treectrl.h"
18
#include "wx/imaglist.h"
18
#include "eidlib.h"
19
#include "eidlib.h"
19
#include "PrintOutData.h"
20
#include "PrintOutData.h"
20
#include "Certif.h"
21
#include "Certif.h"
(-)beid-2.6.0/src/eidviewer/eidviewerNotebook.cpp.orig (-2 / +3 lines)
Lines 18-24 Link Here
18
#include <wx/spinctrl.h>
18
#include <wx/spinctrl.h>
19
#include <wx/splitter.h>
19
#include <wx/splitter.h>
20
#include <wx/listctrl.h>
20
#include <wx/listctrl.h>
21
#include <wx/treectrl.h>
21
#include <wx/treectrl.h>
22
#include <wx/imaglist.h>
22
#include <wx/notebook.h>
23
#include <wx/notebook.h>
23
#include <wx/grid.h>
24
#include <wx/grid.h>
24
#include <wx/datetime.h>
25
#include <wx/datetime.h>
Lines 2280-2286 Link Here
2280
        return hti;
2281
        return hti;
2281
    }
2282
    }
2282
2283
2283
    long lCookie = 0;
2284
    wxTreeItemIdValue lCookie = 0;
2284
    hti = pCtrlTreeCerts->GetFirstChild( hti, lCookie );	
2285
    hti = pCtrlTreeCerts->GetFirstChild( hti, lCookie );	
2285
    do	
2286
    do	
2286
    {		
2287
    {		
Lines 2343-2349 Link Here
2343
    {
2344
    {
2344
        wxBusyCursor wc;
2345
        wxBusyCursor wc;
2345
2346
2346
        wxString strFileTmp = wxFileName::CreateTempFileName(wxT("cert"), NULL);
2347
        wxString strFileTmp = wxFileName::CreateTempFileName(wxT("cert"), (wxFile*)NULL);
2347
        wxFileName oName(strFileTmp);
2348
        wxFileName oName(strFileTmp);
2348
        oName.SetExt(wxT("cer"));
2349
        oName.SetExt(wxT("cer"));
2349
        wxString strFile;
2350
        wxString strFile;

Return to bug 187422