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

OS/2 PM specific fixes for validators and fonts

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
1999-11-08 05:18:15 +00:00
parent aa33452c94
commit 57c4d796c5
21 changed files with 255 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,13 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
inline wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxButtonNameStr)
{
Create(parent, id, bitmap, pos, size, style, validator, name);
@@ -35,7 +41,13 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxButtonNameStr);
virtual void SetLabel(const wxBitmap& bitmap)

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

@@ -25,7 +25,13 @@ class WXDLLEXPORT wxButton: public wxControl
inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxButtonNameStr)
{
Create(parent, id, label, pos, size, style, validator, name);
@@ -34,7 +40,13 @@ class WXDLLEXPORT wxButton: public wxControl
bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxButtonNameStr);
virtual ~wxButton();

24
include/wx/os2/checkbox.h
View File

@@ -27,7 +27,13 @@ class WXDLLEXPORT wxCheckBox: public wxControl
inline wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxCheckBoxNameStr)
{
Create(parent, id, label, pos, size, style, validator, name);
@@ -36,7 +42,13 @@ class WXDLLEXPORT wxCheckBox: public wxControl
bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxCheckBoxNameStr);
virtual void SetValue(bool);
@@ -64,7 +76,13 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
inline wxBitmapCheckBox(wxWindow *parent, wxWindowID id, const wxBitmap *label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxCheckBoxNameStr)
{
Create(parent, id, label, pos, size, style, validator, name);
@@ -73,7 +91,13 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
bool Create(wxWindow *parent, wxWindowID id, const wxBitmap *bitmap,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxCheckBoxNameStr);
virtual void SetLabel(const wxBitmap& bitmap);

6
include/wx/os2/checklst.h
View File

@@ -31,7 +31,13 @@ public:
int nStrings = 0,
const wxString choices[] = NULL,
long style = 0,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxListBoxNameStr);
// override base class virtuals

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

@@ -28,7 +28,13 @@ public:
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
long style = 0,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxChoiceNameStr)
{
Create(parent, id, pos, size, n, choices, style, validator, name);
@@ -39,7 +45,13 @@ public:
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
long style = 0,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxChoiceNameStr);
// Implement base class virtuals

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

@@ -33,7 +33,13 @@ class WXDLLEXPORT wxComboBox: public wxChoice
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
long style = 0,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxComboBoxNameStr)
{
Create(parent, id, value, pos, size, n, choices, style, validator, name);
@@ -45,7 +51,13 @@ class WXDLLEXPORT wxComboBox: public wxChoice
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
long style = 0,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxComboBoxNameStr);
// List functions: see wxChoice

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

@@ -27,7 +27,13 @@ class WXDLLEXPORT wxGauge: public wxControl
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxGA_HORIZONTAL,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxGaugeNameStr)
{
Create(parent, id, range, pos, size, style, validator, name);
@@ -38,7 +44,13 @@ class WXDLLEXPORT wxGauge: public wxControl
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxGA_HORIZONTAL,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxGaugeNameStr);
void SetShadowWidth(int w);

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

@@ -42,7 +42,13 @@ public:
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
long style = 0,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxListBoxNameStr)
{
Create(parent, id, pos, size, n, choices, style, validator, name);
@@ -53,7 +59,13 @@ public:
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
long style = 0,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxListBoxNameStr);
virtual ~wxListBox();

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

@@ -29,7 +29,13 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
int majorDim = 0, long style = wxRA_HORIZONTAL,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
# else
const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
# endif
#endif
{
Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
}
@@ -40,7 +46,13 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
int majorDim = 0, long style = wxRA_HORIZONTAL,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
# else
const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
# endif
#endif
virtual bool OS2Command(WXUINT param, WXWORD id);
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,

24
include/wx/os2/radiobut.h
View File

@@ -26,7 +26,13 @@ class WXDLLEXPORT wxRadioButton: public wxControl
const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxRadioButtonNameStr)
{
Create(parent, id, label, pos, size, style, validator, name);
@@ -36,7 +42,13 @@ class WXDLLEXPORT wxRadioButton: public wxControl
const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxRadioButtonNameStr);
virtual void SetLabel(const wxString& label);
@@ -63,7 +75,13 @@ class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
const wxBitmap *label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxBitmapRadioButtonNameStr)
{
Create(parent, id, label, pos, size, style, validator, name);
@@ -73,7 +91,13 @@ class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
const wxBitmap *label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxBitmapRadioButtonNameStr);
virtual void SetLabel(const wxBitmap *label);

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

@@ -29,7 +29,13 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxSB_HORIZONTAL,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxScrollBarNameStr)
{
Create(parent, id, pos, size, style, validator, name);
@@ -38,7 +44,13 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxSB_HORIZONTAL,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxScrollBarNameStr);
int GetThumbPosition() const ;

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

@@ -166,8 +166,16 @@
// Set this to 0 if your compiler can't cope
// with omission of prototype parameters.
#define wxUSE_ODBC 0
// Define 1 to use ODBC classes
#define wxUSE_ODBC 0
// Define 1 to use ODBC classes
#define wxODBC_FWD_ONLY_CURSORS 1
// Some databases/ODBC drivers only allow forward scrolling cursors.
// Unless you specifically want to use backward scrolling
// cursors, and you know that all of the databases/ODBC drivers
// that you will use these odbc classes with allow backward
// scrolling cursors, this setting should remain set to 1
// for maximum database/driver compatibilty
#define wxUSE_IOSTREAMH 1
// VC++ 4.2 and above allows <iostream> and <iostream.h>

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

@@ -29,7 +29,13 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxSL_HORIZONTAL,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxSliderNameStr)
{
Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
@@ -42,7 +48,13 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxSL_HORIZONTAL,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxSliderNameStr);
virtual int GetValue() const ;

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

@@ -24,7 +24,13 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxTextCtrlNameStr)
{
Create(parent, id, value, pos, size, style, validator, name);
@@ -35,7 +41,13 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator = wxDefaultValidator,
# else
const wxValidator& validator = wxDefaultValidator,
# endif
#endif
const wxString& name = wxTextCtrlNameStr);
// implement base class pure virtuals