SCROLLWIN instead of SCROLL again

[wxWidgets.git] / include / wx / generic / choicdgg.h

diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h
index 553381b050a3c4ac8aae0aaab0c235e6759a10d2..bd0b45d7a02f39a95ef5832388c1c05d0874933c 100644 (file)
--- a/include/wx/generic/choicdgg.h
+++ b/include/wx/generic/choicdgg.h
@@ -64,13 +64,10 @@ public:
                 long style = wxCHOICEDLG_STYLE,
                 const wxPoint& pos = wxDefaultPosition);
 
                 long style = wxCHOICEDLG_STYLE,
                 const wxPoint& pos = wxDefaultPosition);
 

-    void SetSelection(int sel) ;
+    void SetSelection(int sel);

     int GetSelection() const { return m_selection; }
     wxString GetStringSelection() const { return m_stringSelection; }
 
     int GetSelection() const { return m_selection; }
     wxString GetStringSelection() const { return m_stringSelection; }
 

-    // get client data associated with selection
-    void *GetClientData() const { return m_clientData; }
-

     // obsolete function (NB: no need to make it return wxChar, it's untyped)
     char *GetSelectionClientData() const { return (char *)m_clientData; }
 
     // obsolete function (NB: no need to make it return wxChar, it's untyped)
     char *GetSelectionClientData() const { return (char *)m_clientData; }
 


@@ -80,7 +77,7 @@ public:
 
 protected:
     int         m_selection;
 
 protected:
     int         m_selection;

-    int         m_dialogStyle;
+    long        m_dialogStyle;

     wxString    m_stringSelection;
     wxListBox  *m_listbox;
 
     wxString    m_stringSelection;
     wxListBox  *m_listbox;