Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Latest updates for compiling.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-12-21 20:42:20 +00:00
parent 7e67a05520
commit 1908260b42
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/os2/setup0.h
View File

@@ -252,9 +252,6 @@
#define wxUSE_SERIAL 1 #define wxUSE_SERIAL 1
// Use serialization (requires utils/serialize) // 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 wxUSE_TOOLTIPS 1
// Define to use wxToolTip class and // Define to use wxToolTip class and
// wxWindow::SetToolTip() method // wxWindow::SetToolTip() method
@@ -379,5 +376,10 @@
#define wxUSE_UNICODE 0 #define wxUSE_UNICODE 0
#define wxUSE_UNICODE_MSLU 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 #endif
// _WX_SETUP_H_ // _WX_SETUP_H_

12
include/wx/os2/stattext.h
View File

@@ -20,7 +20,7 @@
WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr; WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
class WXDLLEXPORT wxStaticText : public wxControl class WXDLLEXPORT wxStaticText : public wxStaticTextBase
{ {
public: public:
inline wxStaticText() { } inline wxStaticText() { }
@@ -48,8 +48,8 @@ public:
// //
// Accessors // Accessors
// //
void SetLabel(const wxString&); virtual void SetLabel(const wxString& rsLabel);
bool SetFont(const wxFont &rFont); virtual bool SetFont(const wxFont &rFont);
// //
// Overriden base class virtuals // Overriden base class virtuals
@@ -65,6 +65,12 @@ public:
); );
protected: protected:
virtual void DoSetSize( int nX
,int nY
,int nWidth
,int nHeight
,int nSizeFlags = wxSIZE_AUTO
);
virtual wxSize DoGetBestSize(void) const; virtual wxSize DoGetBestSize(void) const;
private: private: