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

m_clientData conflict fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-07-28 22:53:33 +00:00
parent b1519886c3
commit 452fd09f36
5 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/generic/choicdgg.h
View File

@@ -81,7 +81,6 @@ public:
protected: protected:
int m_selection; int m_selection;
wxString m_stringSelection; wxString m_stringSelection;
void *m_clientData;
wxListBox *m_listbox; wxListBox *m_listbox;
private: private:

7
include/wx/gtk/choicdlg.h
View File

@@ -40,9 +40,9 @@ public:
const wxStringList& choices, char **clientData = (char **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition); const wxStringList& choices, char **clientData = (char **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
void SetSelection(int sel) ; void SetSelection(int sel) ;
inline int GetSelection(void) const { return m_selection; } int GetSelection() const { return m_selection; }
inline wxString GetStringSelection(void) const { return m_stringSelection; } wxString GetStringSelection() const { return m_stringSelection; }
inline char *GetSelectionClientData(void) const { return m_clientData; } char *GetSelectionClientData() const { return (char *)m_clientData; }
void OnOK(wxCommandEvent& event); void OnOK(wxCommandEvent& event);
void OnListBoxDClick(wxCommandEvent& event); void OnListBoxDClick(wxCommandEvent& event);
@@ -53,7 +53,6 @@ protected:
long m_dialogStyle; long m_dialogStyle;
int m_selection; int m_selection;
wxString m_stringSelection; wxString m_stringSelection;
char* m_clientData;
}; };
WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, const wxString& caption, WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, const wxString& caption,

7
include/wx/gtk1/choicdlg.h
View File

@@ -40,9 +40,9 @@ public:
const wxStringList& choices, char **clientData = (char **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition); const wxStringList& choices, char **clientData = (char **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
void SetSelection(int sel) ; void SetSelection(int sel) ;
inline int GetSelection(void) const { return m_selection; } int GetSelection() const { return m_selection; }
inline wxString GetStringSelection(void) const { return m_stringSelection; } wxString GetStringSelection() const { return m_stringSelection; }
inline char *GetSelectionClientData(void) const { return m_clientData; } char *GetSelectionClientData() const { return (char *)m_clientData; }
void OnOK(wxCommandEvent& event); void OnOK(wxCommandEvent& event);
void OnListBoxDClick(wxCommandEvent& event); void OnListBoxDClick(wxCommandEvent& event);
@@ -53,7 +53,6 @@ protected:
long m_dialogStyle; long m_dialogStyle;
int m_selection; int m_selection;
wxString m_stringSelection; wxString m_stringSelection;
char* m_clientData;
}; };
WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, const wxString& caption, WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, const wxString& caption,

4
src/gtk/choicdlg.cpp
View File

@@ -327,7 +327,7 @@ void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
{ {
m_selection = listBox->GetSelection(); m_selection = listBox->GetSelection();
m_stringSelection = listBox->GetStringSelection(); m_stringSelection = listBox->GetStringSelection();
m_clientData = (char*)listBox->GetClientData(m_selection); m_clientData = listBox->GetClientData(m_selection);
} }
EndModal(wxID_OK); EndModal(wxID_OK);
@@ -340,7 +340,7 @@ void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))
{ {
m_selection = listBox->GetSelection(); m_selection = listBox->GetSelection();
m_stringSelection = listBox->GetStringSelection(); m_stringSelection = listBox->GetStringSelection();
m_clientData = (char*)listBox->GetClientData(m_selection); m_clientData = listBox->GetClientData(m_selection);
} }
EndModal(wxID_OK); EndModal(wxID_OK);

4
src/gtk1/choicdlg.cpp
View File

@@ -327,7 +327,7 @@ void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
{ {
m_selection = listBox->GetSelection(); m_selection = listBox->GetSelection();
m_stringSelection = listBox->GetStringSelection(); m_stringSelection = listBox->GetStringSelection();
m_clientData = (char*)listBox->GetClientData(m_selection); m_clientData = listBox->GetClientData(m_selection);
} }
EndModal(wxID_OK); EndModal(wxID_OK);
@@ -340,7 +340,7 @@ void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))
{ {
m_selection = listBox->GetSelection(); m_selection = listBox->GetSelection();
m_stringSelection = listBox->GetStringSelection(); m_stringSelection = listBox->GetStringSelection();
m_clientData = (char*)listBox->GetClientData(m_selection); m_clientData = listBox->GetClientData(m_selection);
} }
EndModal(wxID_OK); EndModal(wxID_OK);