From 0616b8382daeca5373484e5a22ec1f322c025c95 Mon Sep 17 00:00:00 2001 From: David Webster Date: Fri, 17 Sep 1999 21:45:56 +0000 Subject: [PATCH] More stubs git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/os2/checklst.cpp | 6 +++--- src/os2/clipbrd.cpp | 4 ++-- src/os2/makefile.va | 21 ++++++++++++++++++--- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp index ecabf5408e..079092b327 100644 --- a/src/os2/checklst.cpp +++ b/src/os2/checklst.cpp @@ -2,7 +2,7 @@ // Name: checklst.cpp // Purpose: implementation of wxCheckListBox class // Author: AUTHOR -// Modified by: +// Modified by: // Created: ??/??/98 // RCS-ID: $Id$ // Copyright: (c) AUTHOR @@ -60,13 +60,13 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, // check items // ----------- -bool wxCheckListBox::IsChecked(uint uiIndex) const +bool wxCheckListBox::IsChecked(unsigned int uiIndex) const { // TODO return FALSE; } -void wxCheckListBox::Check(uint uiIndex, bool bCheck) +void wxCheckListBox::Check(unsigned int uiIndex, bool bCheck) { // TODO } diff --git a/src/os2/clipbrd.cpp b/src/os2/clipbrd.cpp index 3fe9ebfb72..56af0a420b 100644 --- a/src/os2/clipbrd.cpp +++ b/src/os2/clipbrd.cpp @@ -154,7 +154,7 @@ void wxClipboard::SetClipboardClient(wxClipboardClient *client, long time) got_selection = wxCloseClipboard(); } else got_selection = FALSE; - + got_selection = FALSE; // Assume another process takes over if (!got_selection) { @@ -225,7 +225,7 @@ char *wxClipboard::GetClipboardData(char *format, long *length, long time) return NULL; } else { if (wxOpenClipboard()) { - receivedString = (char *)wxGetClipboardData(FormatStringToID(format), + receivedString = (char *)wxGetClipboardData(FormatStringToID(format), length); wxCloseClipboard(); } else diff --git a/src/os2/makefile.va b/src/os2/makefile.va index 4db6413ffd..02073e611b 100644 --- a/src/os2/makefile.va +++ b/src/os2/makefile.va @@ -74,6 +74,7 @@ $(CPPFLAGS) /Fo$@ /Tp $< << GENERICOBJS= \ + ..\generic\$D\caret.obj \ ..\generic\$D\choicdgg.obj \ ..\generic\$D\gridg.obj \ ..\generic\$D\laywin.obj \ @@ -97,6 +98,7 @@ GENERICOBJS= \ # ..\generic\$D\notebook.obj \ GENLIBOBJS= \ + caret.obj \ choicdgg.obj \ gridg.obj \ laywin.obj \ @@ -287,7 +289,11 @@ OS2OBJS = \ ..\os2\$D\bmpbuttn.obj \ ..\os2\$D\brush.obj \ ..\os2\$D\button.obj \ - ..\os2\$D\caret.obj \ + ..\os2\$D\checkbox.obj \ + ..\os2\$D\checklst.obj \ + ..\os2\$D\choice.obj \ + ..\os2\$D\clipbrd.obj \ + ..\os2\$D\colordlg.obj \ ..\os2\$D\dc.obj \ ..\os2\$D\dialog.obj \ ..\os2\$D\frame.obj \ @@ -300,7 +306,11 @@ OS2LIBOBJS = \ bmpbuttn.obj \ brush.obj \ button.obj \ - caret.obj \ + checkbox.obj \ + checklst.obj \ + choice.obj \ + clipbrd.obj \ + colordlg.obj \ dc.obj \ dialog.obj \ frame.obj \ @@ -432,6 +442,7 @@ $(COMLIBOBJS2): copy ..\common\$D\fs_zip.obj $(GENLIBOBJS): + copy ..\generic\$D\caret.obj copy ..\generic\$D\choicdgg.obj copy ..\generic\$D\gridg.obj copy ..\generic\$D\laywin.obj @@ -456,7 +467,11 @@ $(OS2LIBOBJS): copy ..\os2\$D\bmpbuttn.obj copy ..\os2\$D\brush.obj copy ..\os2\$D\button.obj - copy ..\os2\$D\caret.obj + copy ..\os2\$D\checkbox.obj + copy ..\os2\$D\checklst.obj + copy ..\os2\$D\choice.obj + copy ..\os2\$D\clipbrd.obj + copy ..\os2\$D\colordlg.obj copy ..\os2\$D\dc.obj copy ..\os2\$D\dialog.obj copy ..\os2\$D\frame.obj -- 2.45.2