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

Removal of previous wxValidtor code for wxOS2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
1999-11-19 22:36:55 +00:00
parent f68586e51b
commit f38374d0d7
48 changed files with 334 additions and 792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,11 +27,7 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
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)
{
@@ -42,11 +38,7 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
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);

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

@@ -26,11 +26,7 @@ class WXDLLEXPORT wxButton: public wxControl
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)
{
@@ -41,11 +37,7 @@ class WXDLLEXPORT wxButton: public wxControl
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);

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

@@ -28,11 +28,7 @@ class WXDLLEXPORT wxCheckBox: public wxControl
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)
{
@@ -43,11 +39,7 @@ class WXDLLEXPORT wxCheckBox: public wxControl
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);
@@ -77,11 +69,7 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
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)
{
@@ -92,11 +80,7 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
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);

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

@@ -32,11 +32,7 @@ public:
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);

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

@@ -29,11 +29,7 @@ public:
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)
{
@@ -46,11 +42,7 @@ public:
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);

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

@@ -34,11 +34,7 @@ class WXDLLEXPORT wxComboBox: public wxChoice
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)
{
@@ -52,11 +48,7 @@ class WXDLLEXPORT wxComboBox: public wxChoice
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);

158
include/wx/os2/frame.h
View File

@@ -12,37 +12,24 @@
#ifndef _WX_FRAME_H_
#define _WX_FRAME_H_
#include "wx/window.h"
#include "wx/os2/accel.h"
#include "wx/icon.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxStatusBar;
class WXDLLEXPORT wxToolBar;
class WXDLLEXPORT wxFrame : public wxWindow
class WXDLLEXPORT wxFrame : public wxFrameBase
{
DECLARE_DYNAMIC_CLASS(wxFrame)
public:
wxFrame();
// construction
wxFrame() { Init(); }
wxFrame(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr)
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr)
{
Init();
Create(parent, id, title, pos, size, style, name);
}
~wxFrame();
bool Create(wxWindow *parent,
wxWindowID id,
const wxString& title,
@@ -51,104 +38,63 @@ public:
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr);
virtual bool Destroy();
virtual ~wxFrame();
void OnSize(wxSizeEvent& event);
void OnMenuHighlight(wxMenuEvent& event);
void OnActivate(wxActivateEvent& event);
void OnIdle(wxIdleEvent& event);
void OnCloseWindow(wxCloseEvent& event);
bool Show(bool show);
void DetachMenuBar();
// Set menu bar
void SetMenuBar(wxMenuBar *menu_bar);
virtual wxMenuBar *GetMenuBar() const;
// Call this to simulate a menu command
bool Command(int id) { return ProcessCommand(id); }
// process menu command: returns TRUE if processed
bool ProcessCommand(int id);
// make the window modal (all other windows unresponsive)
virtual void MakeModal(bool modal = TRUE);
// Set icon
// implement base class pure virtuals
virtual void Maximize(bool maximize = TRUE);
virtual bool IsMaximized() const;
virtual void Iconize(bool iconize = TRUE);
virtual bool IsIconized() const;
virtual void Restore();
virtual void SetMenuBar(wxMenuBar *menubar);
virtual void SetIcon(const wxIcon& icon);
// implementation only from now on
// -------------------------------
// override some more virtuals
virtual bool Show(bool show = TRUE);
// event handlers
void OnActivate(wxActivateEvent& event);
void OnSysColourChanged(wxSysColourChangedEvent& event);
// Toolbar
#if wxUSE_TOOLBAR
virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
wxWindowID id = -1,
const wxString& name = wxToolBarNameStr);
virtual wxToolBar *OnCreateToolBar(long style, wxWindowID id, const wxString& name);
virtual void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
virtual wxToolBar *GetToolBar() const { return m_frameToolBar; }
virtual void PositionToolBar();
#endif // wxUSE_TOOLBAR
#if wxUSE_STATUSBAR
// Status bar
virtual wxStatusBar* CreateStatusBar(int number = 1,
long style = wxST_SIZEGRIP,
wxWindowID id = 0,
const wxString& name = wxStatusLineNameStr);
wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
void SetStatusBar(wxStatusBar *statusBar) { m_frameStatusBar = statusBar; }
#if wxUSE_STATUSBAR
virtual wxStatusBar* OnCreateStatusBar(int number = 1,
long style = wxST_SIZEGRIP,
wxWindowID id = 0,
const wxString& name = wxStatusLineNameStr);
virtual void PositionStatusBar();
virtual wxStatusBar *OnCreateStatusBar(int number,
long style,
wxWindowID id,
const wxString& name);
// Set status line text
virtual void SetStatusText(const wxString& text, int number = 0);
// Hint to tell framework which status bar to use: the default is to use
// native one for the platforms which support it (Win32), the generic one
// otherwise
// Set status line widths
virtual void SetStatusWidths(int n, const int widths_field[]);
// Hint to tell framework which status bar to use
// TODO: should this go into a wxFrameworkSettings class perhaps?
static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };
static void UseNativeStatusBar(bool useNative)
{ m_useNativeStatusBar = useNative; };
static bool UsesNativeStatusBar()
{ return m_useNativeStatusBar; };
#endif // wxUSE_STATUSBAR
// Iconize
virtual void Iconize(bool iconize);
virtual bool IsIconized() const;
// Is it maximized?
virtual bool IsMaximized() const;
// Compatibility
bool Iconized() const { return IsIconized(); }
virtual void Maximize(bool maximize);
// virtual bool LoadAccelerators(const wxString& table);
// Responds to colour changes
void OnSysColourChanged(wxSysColourChangedEvent& event);
// Query app for menu item updates (called from OnIdle)
void DoMenuUpdates();
void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
WXHMENU GetWinMenu() const { return m_hMenu; }
// Returns the origin of client area (may be different from (0,0) if the
// frame has a toolbar)
virtual wxPoint GetClientAreaOrigin() const;
// Implementation only from here
// event handlers
// event handlers
bool HandlePaint();
bool HandleSize(int x, int y, WXUINT flag);
bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
@@ -158,13 +104,19 @@ public:
wxWindow *wx_win, const wxChar *title,
int x, int y, int width, int height, long style);
// tooltip management
// tooltip management
#if wxUSE_TOOLTIPS
WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
#endif // tooltips
protected:
// common part of all ctors
void Init();
// common part of Iconize(), Maximize() and Restore()
void DoShowWindow(int nShowCmd);
// override base class virtuals
virtual void DoGetClientSize(int *width, int *height) const;
virtual void DoGetSize(int *width, int *height) const;
@@ -175,6 +127,9 @@ protected:
virtual void DoClientToScreen(int *x, int *y) const;
virtual void DoScreenToClient(int *x, int *y) const;
// helper
void DetachMenuBar();
// a plug in for MDI frame classes which need to do something special when
// the menubar is set
virtual void InternalSetMenuBar();
@@ -188,27 +143,20 @@ protected:
// window proc for the frames
MRESULT OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
wxMenuBar * m_frameMenuBar;
wxIcon m_icon;
bool m_iconized;
WXHICON m_defaultIcon;
#if wxUSE_STATUSBAR
wxStatusBar * m_frameStatusBar;
static bool m_useNativeStatusBar;
#endif // wxUSE_STATUSBAR
#if wxUSE_TOOLBAR
wxToolBar* m_frameToolBar;
#endif // wxUSE_TOOLBAR
private:
#if wxUSE_TOOLTIPS
WXHWND m_hwndToolTip;
#endif // tooltips
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxFrame)
};
#endif

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

@@ -28,11 +28,7 @@ class WXDLLEXPORT wxGauge: public wxControl
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)
{
@@ -45,11 +41,7 @@ class WXDLLEXPORT wxGauge: public wxControl
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);

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

@@ -43,11 +43,7 @@ public:
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)
{
@@ -60,11 +56,7 @@ public:
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);

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

@@ -30,11 +30,7 @@ public:
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);
@@ -47,11 +43,7 @@ public:
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);

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

@@ -27,11 +27,7 @@ class WXDLLEXPORT wxRadioButton: public wxControl
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)
{
@@ -43,11 +39,7 @@ class WXDLLEXPORT wxRadioButton: public wxControl
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);
@@ -76,11 +68,7 @@ class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
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)
{
@@ -92,11 +80,7 @@ class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
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);

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

@@ -30,11 +30,7 @@ public:
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)
{
@@ -45,11 +41,7 @@ public:
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);

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

@@ -30,11 +30,7 @@ public:
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)
{
@@ -49,11 +45,7 @@ public:
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);

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

@@ -25,11 +25,7 @@ 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
const wxString& name = wxTextCtrlNameStr)
{
@@ -42,11 +38,7 @@ 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
const wxString& name = wxTextCtrlNameStr);