m_clientData conflict fixed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h
index b796f68abacb59f8179bf81898ce9d923afa5805..4e240a0f9819473a4f8cdb2684c9b9d1edbc3a3a 100644 (file)
--- a/include/wx/generic/choicdgg.h
+++ b/include/wx/generic/choicdgg.h
@@ -81,7 +81,6 @@ public:
 protected:
     int         m_selection;
     wxString    m_stringSelection;
 protected:
     int         m_selection;
     wxString    m_stringSelection;

-    void       *m_clientData;

     wxListBox  *m_listbox;
 
 private:
     wxListBox  *m_listbox;
 
 private:

diff --git a/include/wx/gtk/choicdlg.h b/include/wx/gtk/choicdlg.h
index 18bab09619233e663b2cf7d474555b83ca4048bd..c9f6c4ee66f7702265e42db352d849032474de14 100644 (file)
--- a/include/wx/gtk/choicdlg.h
+++ b/include/wx/gtk/choicdlg.h
@@ -40,9 +40,9 @@ public:
         const wxStringList& choices, char **clientData = (char **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
 
     void SetSelection(int sel) ;
         const wxStringList& choices, char **clientData = (char **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
 
     void SetSelection(int sel) ;

-    inline int GetSelection(void) const { return m_selection; }
-    inline wxString GetStringSelection(void) const { return m_stringSelection; }
-    inline char *GetSelectionClientData(void) const { return m_clientData; }
+    int GetSelection() const { return m_selection; }
+    wxString GetStringSelection() const { return m_stringSelection; }
+    char *GetSelectionClientData() const { return (char *)m_clientData; }

 
     void OnOK(wxCommandEvent& event);
     void OnListBoxDClick(wxCommandEvent& event);
 
     void OnOK(wxCommandEvent& event);
     void OnListBoxDClick(wxCommandEvent& event);


@@ -53,7 +53,6 @@ protected:
     long        m_dialogStyle;
     int         m_selection;
     wxString    m_stringSelection;
     long        m_dialogStyle;
     int         m_selection;
     wxString    m_stringSelection;

-    char*     m_clientData;

 };
 
 WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, const wxString& caption,
 };
 
 WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, const wxString& caption,

diff --git a/include/wx/gtk1/choicdlg.h b/include/wx/gtk1/choicdlg.h
index 18bab09619233e663b2cf7d474555b83ca4048bd..c9f6c4ee66f7702265e42db352d849032474de14 100644 (file)
--- a/include/wx/gtk1/choicdlg.h
+++ b/include/wx/gtk1/choicdlg.h
@@ -40,9 +40,9 @@ public:
         const wxStringList& choices, char **clientData = (char **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
 
     void SetSelection(int sel) ;
         const wxStringList& choices, char **clientData = (char **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
 
     void SetSelection(int sel) ;

-    inline int GetSelection(void) const { return m_selection; }
-    inline wxString GetStringSelection(void) const { return m_stringSelection; }
-    inline char *GetSelectionClientData(void) const { return m_clientData; }
+    int GetSelection() const { return m_selection; }
+    wxString GetStringSelection() const { return m_stringSelection; }
+    char *GetSelectionClientData() const { return (char *)m_clientData; }

 
     void OnOK(wxCommandEvent& event);
     void OnListBoxDClick(wxCommandEvent& event);
 
     void OnOK(wxCommandEvent& event);
     void OnListBoxDClick(wxCommandEvent& event);


@@ -53,7 +53,6 @@ protected:
     long        m_dialogStyle;
     int         m_selection;
     wxString    m_stringSelection;
     long        m_dialogStyle;
     int         m_selection;
     wxString    m_stringSelection;

-    char*     m_clientData;

 };
 
 WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, const wxString& caption,
 };
 
 WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, const wxString& caption,

diff --git a/src/gtk/choicdlg.cpp b/src/gtk/choicdlg.cpp
index b9d9c5b24c1c23fa062ca68807389a9dde4d66f1..806b21e46da86f12e783e912a9f43380a9d7ac69 100644 (file)
--- a/src/gtk/choicdlg.cpp
+++ b/src/gtk/choicdlg.cpp
@@ -327,7 +327,7 @@ void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
     {
         m_selection = listBox->GetSelection();
         m_stringSelection = listBox->GetStringSelection();
     {
         m_selection = listBox->GetSelection();
         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_stringSelection = listBox->GetStringSelection();
     {
         m_selection = listBox->GetSelection();
         m_stringSelection = listBox->GetStringSelection();

-        m_clientData = (char*)listBox->GetClientData(m_selection);
+        m_clientData = listBox->GetClientData(m_selection);

     }
 
     EndModal(wxID_OK);
     }
 
     EndModal(wxID_OK);

diff --git a/src/gtk1/choicdlg.cpp b/src/gtk1/choicdlg.cpp
index b9d9c5b24c1c23fa062ca68807389a9dde4d66f1..806b21e46da86f12e783e912a9f43380a9d7ac69 100644 (file)
--- a/src/gtk1/choicdlg.cpp
+++ b/src/gtk1/choicdlg.cpp
@@ -327,7 +327,7 @@ void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
     {
         m_selection = listBox->GetSelection();
         m_stringSelection = listBox->GetStringSelection();
     {
         m_selection = listBox->GetSelection();
         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_stringSelection = listBox->GetStringSelection();
     {
         m_selection = listBox->GetSelection();
         m_stringSelection = listBox->GetStringSelection();

-        m_clientData = (char*)listBox->GetClientData(m_selection);
+        m_clientData = listBox->GetClientData(m_selection);

     }
 
     EndModal(wxID_OK);
     }
 
     EndModal(wxID_OK);