From 57c4d796c56bd48ce370240107f3e4c07e142985 Mon Sep 17 00:00:00 2001 From: David Webster Date: Mon, 8 Nov 1999 05:18:15 +0000 Subject: [PATCH] OS/2 PM specific fixes for validators and fonts git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/control.h | 6 +++++ include/wx/fontutil.h | 2 +- include/wx/generic/listctrl.h | 44 ++++++++++++++++++++++++----------- include/wx/generic/treectrl.h | 18 ++++++++++++++ include/wx/os2/bmpbuttn.h | 12 ++++++++++ include/wx/os2/button.h | 12 ++++++++++ include/wx/os2/checkbox.h | 24 +++++++++++++++++++ include/wx/os2/checklst.h | 6 +++++ include/wx/os2/choice.h | 12 ++++++++++ include/wx/os2/combobox.h | 12 ++++++++++ include/wx/os2/gauge.h | 12 ++++++++++ include/wx/os2/listbox.h | 12 ++++++++++ include/wx/os2/radiobox.h | 12 ++++++++++ include/wx/os2/radiobut.h | 24 +++++++++++++++++++ include/wx/os2/scrolbar.h | 12 ++++++++++ include/wx/os2/setup.h | 12 ++++++++-- include/wx/os2/slider.h | 12 ++++++++++ include/wx/os2/textctrl.h | 12 ++++++++++ include/wx/thread.h | 9 ++----- include/wx/validate.h | 4 ++++ include/wx/window.h | 10 +++++++- 21 files changed, 255 insertions(+), 24 deletions(-) diff --git a/include/wx/control.h b/include/wx/control.h index 47c78785c5..5b93250282 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -41,7 +41,13 @@ protected: const wxPoint& pos, const wxSize& size, long style, +#if wxUSE_VALIDATORS +# if defined(__VISAGECPP__) + const wxValidator* validator, +# else const wxValidator& validator, +# endif +#endif const wxString& name); // inherit colour and font settings from the parent window diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h index 3f439b2c0c..635641e0fa 100644 --- a/include/wx/fontutil.h +++ b/include/wx/fontutil.h @@ -53,7 +53,7 @@ struct WXDLLEXPORT wxNativeEncodingInfo { wxString facename; // may be empty meaning "any" -#if defined(__WXMSW__) +#if defined(__WXMSW__) || defined(__WXPM__) wxNativeEncodingInfo() { charset = 0; /* ANSI_CHARSET */ } int charset; diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index 32f7e7098d..48418b1dc9 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -225,7 +225,7 @@ public: int GetImage() const; void GetItem( wxListItem &info ); wxColour *GetColour(); - + private: DECLARE_DYNAMIC_CLASS(wxListItemData); }; @@ -376,15 +376,21 @@ class WXDLLEXPORT wxListTextCtrl: public wxTextCtrl public: wxListTextCtrl() {}; - wxListTextCtrl( wxWindow *parent, const wxWindowID id, + wxListTextCtrl( wxWindow *parent, const wxWindowID id, bool *accept, wxString *res, wxListMainWindow *owner, const wxString &value = "", const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, +#if wxUSE_VALIDATORS +# if defined(__VISAGECPP__) + int style = 0, const wxValidator* validator = wxDefaultValidator, +# else int style = 0, const wxValidator& validator = wxDefaultValidator, +# endif +#endif const wxString &name = "wxListTextCtrlText" ); void OnChar( wxKeyEvent &event ); void OnKillFocus( wxFocusEvent &event ); - + DECLARE_EVENT_TABLE() }; @@ -436,12 +442,12 @@ class WXDLLEXPORT wxListMainWindow: public wxScrolledWindow void SelectLine( wxListLineData *line ); void DeselectLine( wxListLineData *line ); void DeleteLine( wxListLineData *line ); - + void EditLabel( long item ); void Edit( long item ) { EditLabel(item); } // deprecated void OnRenameTimer(); void OnRenameAccept(); - + void OnMouse( wxMouseEvent &event ); void MoveToFocus(); void OnArrowChar( wxListLineData *newCurrent, bool shiftDown ); @@ -450,7 +456,7 @@ class WXDLLEXPORT wxListMainWindow: public wxScrolledWindow void OnSetFocus( wxFocusEvent &event ); void OnKillFocus( wxFocusEvent &event ); void OnSize( wxSizeEvent &event ); - + void DrawImage( int index, wxDC *dc, int x, int y ); void GetImageSize( int index, int &width, int &height ); int GetIndexOfLine( const wxListLineData *line ); @@ -507,7 +513,13 @@ class WXDLLEXPORT wxListCtrl: public wxControl wxListCtrl(); wxListCtrl( wxWindow *parent, wxWindowID id = -1, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, +#if wxUSE_VALIDATORS +# if defined(__VISAGECPP__) + long style = wxLC_ICON, const wxValidator* validator = wxDefaultValidator, +# else long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, +# endif +#endif const wxString &name = "listctrl" ) { Create(parent, id, pos, size, style, validator, name); @@ -515,7 +527,13 @@ class WXDLLEXPORT wxListCtrl: public wxControl ~wxListCtrl(); bool Create( wxWindow *parent, wxWindowID id = -1, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, +#if wxUSE_VALIDATORS +# if defined(__VISAGECPP__) + long style = wxLC_ICON, const wxValidator* validator = wxDefaultValidator, +# else long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, +# endif +#endif const wxString &name = "listctrl" ); void OnSize( wxSizeEvent &event ); bool GetColumn( int col, wxListItem& item ) const; @@ -551,16 +569,16 @@ class WXDLLEXPORT wxListCtrl: public wxControl wxImageList *GetImageList( int which ) const; void SetImageList( wxImageList *imageList, int which ); bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC - + void ClearAll(); bool DeleteItem( long item ); bool DeleteAllItems(); bool DeleteAllColumns(); bool DeleteColumn( int col ); - + void EditLabel( long item ) { Edit(item); } void Edit( long item ); - + bool EnsureVisible( long item ); long FindItem( long start, const wxString& str, bool partial = FALSE ); long FindItem( long start, long data ); @@ -577,13 +595,13 @@ class WXDLLEXPORT wxListCtrl: public wxControl bool SortItems( wxListCtrlCompare fn, long data ); bool Update( long item ); void OnIdle( wxIdleEvent &event ); - + // We have to hand down a few functions - + bool SetBackgroundColour( const wxColour &colour ); bool SetForegroundColour( const wxColour &colour ); bool SetFont( const wxFont &font ); - + #if wxUSE_DRAG_AND_DROP void SetDropTarget( wxDropTarget *dropTarget ) { m_mainWin->SetDropTarget( dropTarget ); } @@ -603,7 +621,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl { m_mainWin->SetFocus(); } // implementation - + wxImageList *m_imageListNormal; wxImageList *m_imageListSmall; wxImageList *m_imageListState; // what's that ? diff --git a/include/wx/generic/treectrl.h b/include/wx/generic/treectrl.h index 00c139de9b..3155e83cbe 100644 --- a/include/wx/generic/treectrl.h +++ b/include/wx/generic/treectrl.h @@ -181,7 +181,13 @@ class WXDLLEXPORT wxTreeTextCtrl: public wxTextCtrl bool *accept, wxString *res, wxTreeCtrl *owner, const wxString &value = wxEmptyString, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, +#if wxUSE_VALIDATORS +# if defined(__VISAGECPP__) + int style = 0, const wxValidator* validator = wxDefaultValidator, +# else int style = 0, const wxValidator& validator = wxDefaultValidator, +# endif +#endif const wxString &name = wxTextCtrlNameStr ); void OnChar( wxKeyEvent &event ); void OnKillFocus( wxFocusEvent &event ); @@ -204,7 +210,13 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT, +#if wxUSE_VALIDATORS +# if defined(__VISAGECPP__) + const wxValidator *validator = wxDefaultValidator, +# else const wxValidator &validator = wxDefaultValidator, +# endif +#endif const wxString& name = wxTreeCtrlNameStr) { Create(parent, id, pos, size, style, validator, name); @@ -216,7 +228,13 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT, +#if wxUSE_VALIDATORS +# if defined(__VISAGECPP__) + const wxValidator *validator = wxDefaultValidator, +# else const wxValidator &validator = wxDefaultValidator, +# endif +#endif const wxString& name = wxTreeCtrlNameStr); // accessors diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h index 548e005b0e..76e7fbdaea 100644 --- a/include/wx/os2/bmpbuttn.h +++ b/include/wx/os2/bmpbuttn.h @@ -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) diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h index 802f1c3623..09614dc3c1 100644 --- a/include/wx/os2/button.h +++ b/include/wx/os2/button.h @@ -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(); diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h index 8033fd4dd0..677f3699f7 100644 --- a/include/wx/os2/checkbox.h +++ b/include/wx/os2/checkbox.h @@ -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); diff --git a/include/wx/os2/checklst.h b/include/wx/os2/checklst.h index 8daaf42fc8..59a7951d67 100644 --- a/include/wx/os2/checklst.h +++ b/include/wx/os2/checklst.h @@ -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 diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h index f124982646..54eab34fa1 100644 --- a/include/wx/os2/choice.h +++ b/include/wx/os2/choice.h @@ -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 diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h index b36c2eeae3..1d9b4392f4 100644 --- a/include/wx/os2/combobox.h +++ b/include/wx/os2/combobox.h @@ -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 diff --git a/include/wx/os2/gauge.h b/include/wx/os2/gauge.h index 544b633099..cdb6d227f6 100644 --- a/include/wx/os2/gauge.h +++ b/include/wx/os2/gauge.h @@ -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); diff --git a/include/wx/os2/listbox.h b/include/wx/os2/listbox.h index 81149bf414..4a5691fb7b 100644 --- a/include/wx/os2/listbox.h +++ b/include/wx/os2/listbox.h @@ -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(); diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h index 576e12b114..ec2ac64f86 100644 --- a/include/wx/os2/radiobox.h +++ b/include/wx/os2/radiobox.h @@ -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, diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h index 4d4e48a579..996f74487c 100644 --- a/include/wx/os2/radiobut.h +++ b/include/wx/os2/radiobut.h @@ -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); diff --git a/include/wx/os2/scrolbar.h b/include/wx/os2/scrolbar.h index bbf15a8d3b..7be44ed401 100644 --- a/include/wx/os2/scrolbar.h +++ b/include/wx/os2/scrolbar.h @@ -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 ; diff --git a/include/wx/os2/setup.h b/include/wx/os2/setup.h index f3c14fe123..802b4b91da 100644 --- a/include/wx/os2/setup.h +++ b/include/wx/os2/setup.h @@ -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 and diff --git a/include/wx/os2/slider.h b/include/wx/os2/slider.h index 73baac3111..09ed090957 100644 --- a/include/wx/os2/slider.h +++ b/include/wx/os2/slider.h @@ -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 ; diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h index 7bf7bdb077..56ba625ffa 100644 --- a/include/wx/os2/textctrl.h +++ b/include/wx/os2/textctrl.h @@ -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 diff --git a/include/wx/thread.h b/include/wx/thread.h index 39bc1dd2d4..2c6f2f8c0e 100644 --- a/include/wx/thread.h +++ b/include/wx/thread.h @@ -134,11 +134,9 @@ private: // in order to avoid any overhead under !MSW make all wxCriticalSection class // functions inline - but this can't be done under MSW -#if defined(__WXMSW__) +#if defined(__WXMSW__) || defined(__WXPM__) class WXDLLEXPORT wxCriticalSectionInternal; #define WXCRITICAL_INLINE -#elif defined(__WXPM__) - #define WXCRITICAL_INLINE #else // !MSW && !PM #define WXCRITICAL_INLINE inline #endif // MSW/!MSW @@ -162,7 +160,7 @@ private: wxCriticalSection(const wxCriticalSection&); wxCriticalSection& operator=(const wxCriticalSection&); -#if defined(__WXMSW__) +#if defined(__WXMSW__) || defined(__WXPM__) wxCriticalSectionInternal *m_critsect; #else // !MSW wxMutex m_mutex; @@ -409,9 +407,6 @@ public: // returns TRUE if the main thread has GUI lock extern bool WXDLLEXPORT wxGuiOwnedByMainThread(); - - inline wxCriticalSection::wxCriticalSection() { } - inline wxCriticalSection::~wxCriticalSection() { } #else // !MSW && !PM // implement wxCriticalSection using mutexes inline wxCriticalSection::wxCriticalSection() { } diff --git a/include/wx/validate.h b/include/wx/validate.h index 25a4c5894a..370f38e473 100644 --- a/include/wx/validate.h +++ b/include/wx/validate.h @@ -82,7 +82,11 @@ private: DECLARE_DYNAMIC_CLASS(wxValidator) }; +#if defined(__VISAGECPP__) +WXDLLEXPORT_DATA(extern const wxValidator*) wxDefaultValidator; +#else WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator; +#endif #endif // wxUSE_VALIDATORS diff --git a/include/wx/window.h b/include/wx/window.h index 429a44fdff..7d11de1b10 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -122,7 +122,11 @@ public: const wxSize& size = wxDefaultSize, long style = 0, #if wxUSE_VALIDATORS +# if defined(__VISAGECPP__) + const wxValidator* validator = wxDefaultValidator, +# else const wxValidator& validator = wxDefaultValidator, +# endif #endif // wxUSE_VALIDATORS const wxString& name = wxPanelNameStr); @@ -281,7 +285,7 @@ public: int GetMinHeight() const { return m_minHeight; } int GetMaxWidth() const { return m_maxWidth; } int GetMaxHeight() const { return m_maxHeight; } - + // window state // ------------ @@ -376,7 +380,11 @@ public: #if wxUSE_VALIDATORS // a window may have an associated validator which is used to control // user input +# if defined(__VISAGECPP__) + virtual void SetValidator( const wxValidator *validator ); +# else virtual void SetValidator( const wxValidator &validator ); +# endif virtual wxValidator *GetValidator() { return m_windowValidator; } #endif // wxUSE_VALIDATORS