Latest updates for compiling.

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

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 689c1ab4c902d7534b5c00edf7c83ee232989d71..e0eb8e2836c3cbb3d639c5febc6794f08e9dab0c 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -252,9 +252,6 @@
 
 #define wxUSE_SERIAL        1
                                   // Use serialization (requires utils/serialize)
-#define wxUSE_DYNLIB_CLASS  1
-                                  // Compile in wxLibrary class for run-time
-                                  // DLL loading and function calling
 #define wxUSE_TOOLTIPS      1
                                   // Define to use wxToolTip class and
                                   // wxWindow::SetToolTip() method
@@ -379,5 +376,10 @@
 #define wxUSE_UNICODE      0
 #define wxUSE_UNICODE_MSLU 0
 
+#define wxUSE_DYNLIB_CLASS  1
+                                  // Compile in wxLibrary class for run-time
+                                  // DLL loading and function calling
+#define wxUSE_DYNAMIC_LOADER 0
+
 #endif
     // _WX_SETUP_H_

diff --git a/include/wx/os2/stattext.h b/include/wx/os2/stattext.h
index 66da229103fb0bd56c18df12937ff27f09cd928b..9840a9090cf33fd50c32cfb5b7763fe2085b5e6d 100644 (file)
--- a/include/wx/os2/stattext.h
+++ b/include/wx/os2/stattext.h
@@ -20,7 +20,7 @@
 
 WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
 
-class WXDLLEXPORT wxStaticText : public wxControl
+class WXDLLEXPORT wxStaticText : public wxStaticTextBase
 {
 public:
     inline wxStaticText() { }
@@ -48,8 +48,8 @@ public:
     //
     // Accessors
     //
-    void SetLabel(const wxString&);
-    bool SetFont(const wxFont &rFont);
+    virtual void SetLabel(const wxString& rsLabel);
+    virtual bool SetFont(const wxFont &rFont);
 
     //
     // Overriden base class virtuals
@@ -65,6 +65,12 @@ public:
                                  );
 
 protected:
+    virtual void   DoSetSize( int nX
+                             ,int nY
+                             ,int nWidth
+                             ,int nHeight
+                             ,int nSizeFlags = wxSIZE_AUTO
+                            );
     virtual wxSize DoGetBestSize(void) const;
 
 private: