More OS/2 stubs and caret fix

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

diff --git a/include/wx/caret.h b/include/wx/caret.h
index 7ab4acc752690460bce07c227b5dfab03075f4f1..f16884bd9035f7d485bfc36ad2efec3865e88242 100644 (file)
--- a/include/wx/caret.h
+++ b/include/wx/caret.h
@@ -182,8 +182,6 @@ private:
 
 #if defined(__WXMSW__)
     #include "wx/msw/caret.h"
-#elif  defined(__WXPM__)
-    #include "wx/os2/caret.h"
 #else
     #include "wx/generic/caret.h"
 #endif // platform

diff --git a/include/wx/os2/checklst.h b/include/wx/os2/checklst.h
index 19b4ccb8d35bda67a8213d977bd568346665fad6..0834797550aae5d17ea6cc91bf1c77a9b03989a5 100644 (file)
--- a/include/wx/os2/checklst.h
+++ b/include/wx/os2/checklst.h
@@ -3,7 +3,7 @@
 // Purpose:     wxCheckListBox class - a listbox with checkable items
 //              Note: this is an optional class.
 // Author:      AUTHOR
-// Modified by: 
+// Modified by:
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
@@ -30,7 +30,7 @@ public:
   wxCheckListBox(wxWindow *parent, wxWindowID id,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
-                 int nStrings = 0, 
+                 int nStrings = 0,
                  const wxString choices[] = NULL,
                  long style = 0,
                  const wxValidator& validator = wxDefaultValidator,
@@ -44,4 +44,4 @@ public:
 };
 
 #endif
-    // _WX_CHECKLST_H_
+   // _WX_CHECKLST_H_

diff --git a/include/wx/os2/clipbrd.h b/include/wx/os2/clipbrd.h
index 697dc9d9396cdf42f030823e258ab626b42dca2c..d09d8b7f1893719959038fe8512f1bc5b15ea4c3 100644 (file)
--- a/include/wx/os2/clipbrd.h
+++ b/include/wx/os2/clipbrd.h
@@ -87,7 +87,7 @@ class WXDLLEXPORT wxClipboard : public wxObject
   char *GetClipboardData(char *format, long *length, long time);
 
   /* Get the clipboard client directly. Will be NULL if clipboard data
-     is a string, or if some other application owns the clipboard. 
+     is a string, or if some other application owns the clipboard.
      This can be useful for shortcutting data translation, if the
      clipboard user can check for a specific client. (This is used
      by the wxMediaEdit class.) */

diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h
index e4be296d929fe941e6063147387f4ee1870d4300..d15134c520afafc136ec1d4125e8859af781113a 100644 (file)
--- a/include/wx/os2/metafile.h
+++ b/include/wx/os2/metafile.h
@@ -20,6 +20,7 @@
 #endif
 
 #include "wx/setup.h"
+#include "wx/dc.h"
 
 /*
  * Metafile and metafile device context classes - work in Windows 3.1 only