support for vetoing grid cell editing (patch 469049)

[wxWidgets.git] / include / wx / os2 / choice.h

diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h
index f2c7efe954dedf0fd9ae06721f2519929f299fff..11358cd4ddcbd346a674b17f11e8c6633e6c536e 100644 (file)
--- a/include/wx/os2/choice.h
+++ b/include/wx/os2/choice.h
@@ -61,7 +61,7 @@ public:
 
     // OS2 only
     virtual bool OS2Command(WXUINT param, WXWORD id);
 
     // OS2 only
     virtual bool OS2Command(WXUINT param, WXWORD id);

-    MRESULT OS2WindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    MRESULT OS2WindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

 
 protected:
     virtual void DoSetItemClientData( int n, void* clientData );
 
 protected:
     virtual void DoSetItemClientData( int n, void* clientData );


@@ -74,18 +74,6 @@ protected:
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);

-private:
-    // Virtual function hiding supression
-/*
-    inline virtual void DoSetClientData( void *data )
-    { wxWindowBase::DoSetClientData(data); }
-    inline virtual void DoSetClientObject( wxClientData *data )
-    { wxWindowBase::DoSetClientObject(data); }
-    inline virtual wxClientData *DoGetClientObject() const
-    { return(wxWindowBase::DoGetClientObject());}
-    inline virtual void *DoGetClientData() const
-    { return(wxWindowBase::DoGetClientData());}
-*/

 };
 
 #endif // _WX_CHOICE_H_
 };
 
 #endif // _WX_CHOICE_H_