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

Implementing some more controls and an MDI child frame fix for wxFrame.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-11-16 18:40:45 +00:00
parent f6c2a6f418
commit fb49f3b32e
4 changed files with 159 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,57 +23,91 @@ public:
// ctors // ctors
inline wxChoice() { } inline wxChoice() { }
inline wxChoice(wxWindow *parent, wxWindowID id, inline wxChoice( wxWindow* pParent
const wxPoint& pos = wxDefaultPosition, ,wxWindowID vId
const wxSize& size = wxDefaultSize, ,const wxPoint& rPos = wxDefaultPosition
int n = 0, const wxString choices[] = NULL, ,const wxSize& rSize = wxDefaultSize
long style = 0, ,int n = 0
,const wxString asChoices[] = NULL
,long lStyle = 0
#if wxUSE_VALIDATORS #if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator, ,const wxValidator& rValidator = wxDefaultValidator
#endif #endif
const wxString& name = wxChoiceNameStr) ,const wxString& rsName = wxChoiceNameStr
)
{ {
Create(parent, id, pos, size, n, choices, style, validator, name); Create( pParent
,vId
,rPos
,rSize
,n
,asChoices
,lStyle
#if wxUSE_VALIDATORS
,rValidator
#endif
,rsName
);
} }
bool Create(wxWindow *parent, wxWindowID id, bool Create( wxWindow* pParent
const wxPoint& pos = wxDefaultPosition, ,wxWindowID vId
const wxSize& size = wxDefaultSize, ,const wxPoint& rPos = wxDefaultPosition
int n = 0, const wxString choices[] = NULL, ,const wxSize& rSize = wxDefaultSize
long style = 0, ,int n = 0
,const wxString asChoices[] = NULL
,long lStyle = 0
#if wxUSE_VALIDATORS #if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator, ,const wxValidator& rValidator = wxDefaultValidator
#endif #endif
const wxString& name = wxChoiceNameStr); ,const wxString& rsName = wxChoiceNameStr
);
//
// Implement base class virtuals // Implement base class virtuals
virtual int DoAppend(const wxString& item); //
virtual void Delete(int n); virtual int DoAppend(const wxString& rsItem);
virtual void Clear(); virtual void Delete(int n);
virtual void Clear(void);
virtual int GetCount() const; virtual int GetCount(void) const;
virtual int GetSelection() const ; virtual int GetSelection(void) const ;
virtual void SetSelection(int n); virtual void SetSelection(int n);
virtual int FindString(const wxString& s) const; virtual int FindString(const wxString& rsStr) const;
virtual wxString GetString(int n) const ; virtual wxString GetString(int n) const ;
virtual void SetString(int n, const wxString& s); virtual void SetString( int n
,const wxString& rsStr
);
//
// OS2 only // OS2 only
virtual bool OS2Command(WXUINT param, WXWORD id); //
MRESULT OS2WindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual bool OS2Command( WXUINT uParam
,WXWORD wId
);
MRESULT OS2WindowProc( WXUINT uMsg
,WXWPARAM wParam
,WXLPARAM lParam
);
protected: protected:
virtual void DoSetItemClientData( int n, void* clientData ); virtual void DoSetItemClientData( int n
virtual void* DoGetItemClientData( int n ) const; ,void* pClientData
virtual void DoSetItemClientObject( int n, wxClientData* clientData ); );
virtual wxClientData* DoGetItemClientObject( int n ) const; virtual void* DoGetItemClientData(int n) const;
virtual void DoSetItemClientObject( int n
// OS2 implementation ,wxClientData* pClientData
virtual wxSize DoGetBestSize() const; );
virtual void DoSetSize(int x, int y, virtual wxClientData* DoGetItemClientObject(int n) const;
int width, int height, virtual wxSize DoGetBestSize(void) const;
int sizeFlags = wxSIZE_AUTO); virtual void DoSetSize( int nX
}; ,int nY
,int nWidth
,int nHeight
,int nsizeFlags = wxSIZE_AUTO
);
void Free(void);
}; // end of CLASS wxChoice
#endif // _WX_CHOICE_H_ #endif // _WX_CHOICE_H_

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

@@ -20,64 +20,103 @@ WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr;
WXDLLEXPORT_DATA(extern const char*) wxEmptyString; WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
// Combobox item // Combobox item
class WXDLLEXPORT wxComboBox: public wxChoice class WXDLLEXPORT wxComboBox : public wxChoice
{ {
DECLARE_DYNAMIC_CLASS(wxComboBox)
public: public:
inline wxComboBox() {} inline wxComboBox() {}
inline wxComboBox(wxWindow *parent, wxWindowID id, inline wxComboBox( wxWindow* pParent
const wxString& value = wxEmptyString, ,wxWindowID vId
const wxPoint& pos = wxDefaultPosition, ,const wxString& rsValue = wxEmptyString
const wxSize& size = wxDefaultSize, ,const wxPoint& rPos = wxDefaultPosition
int n = 0, const wxString choices[] = NULL, ,const wxSize& rSize = wxDefaultSize
long style = 0, ,int n = 0
,const wxString asChoices[] = NULL
,long lStyle = 0
#if wxUSE_VALIDATORS #if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator, ,const wxValidator& rValidator = wxDefaultValidator
#endif #endif
const wxString& name = wxComboBoxNameStr) ,const wxString& rsName = wxComboBoxNameStr
{ )
Create(parent, id, value, pos, size, n, choices, style, validator, name); {
} Create( pParent
,vId
bool Create(wxWindow *parent, wxWindowID id, ,rsValue
const wxString& value = wxEmptyString, ,rPos
const wxPoint& pos = wxDefaultPosition, ,rSize
const wxSize& size = wxDefaultSize, ,n
int n = 0, const wxString choices[] = NULL, ,asChoices
long style = 0, ,lStyle
#if wxUSE_VALIDATORS #if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator, ,rValidator
#endif #endif
const wxString& name = wxComboBoxNameStr); ,rsName
);
}
bool Create( wxWindow* pParent
,wxWindowID vId
,const wxString& rsValue = wxEmptyString
,const wxPoint& rPos = wxDefaultPosition
,const wxSize& rSize = wxDefaultSize
,int n = 0
,const wxString asChoices[] = NULL
,long lStyle = 0
#if wxUSE_VALIDATORS
,const wxValidator& rValidator = wxDefaultValidator
#endif
,const wxString& rsName = wxComboBoxNameStr
);
//
// List functions: see wxChoice // List functions: see wxChoice
//
inline wxString GetValue(void) const { return GetLabel(); }
virtual void SetValue(const wxString& rsValue);
wxString GetValue() const { return GetLabel(); } //
virtual void SetValue(const wxString& value);
// Clipboard operations // Clipboard operations
//
virtual void Copy(); virtual void Copy();
virtual void Cut(); virtual void Cut();
virtual void Paste(); virtual void Paste();
virtual void SetInsertionPoint(long pos);
virtual void SetInsertionPointEnd();
virtual long GetInsertionPoint() const;
virtual long GetLastPosition() const;
virtual void Replace(long from, long to, const wxString& value);
virtual void Remove(long from, long to);
virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
virtual void SetSelection(long from, long to);
virtual void SetEditable(bool editable);
virtual bool OS2Command(WXUINT param, WXWORD id); virtual void SetInsertionPoint(long lPos);
virtual void SetInsertionPointEnd(void);
virtual long GetInsertionPoint(void) const;
virtual long GetLastPosition(void) const;
virtual void Replace( long lFrom
,long lTo
,const wxString& rsValue
);
virtual void Remove( long lFrom
,long lTo
);
inline virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
virtual void SetSelection( long lFrom
,long lTo
);
virtual void SetEditable(bool bEditable);
virtual bool OS2Command( WXUINT uParam
,WXWORD wId
);
bool ProcessEditMsg( WXUINT uMsg
,WXWPARAM wParam
,WXLPARAM lParam
);
protected: protected:
virtual void DoSetSize(int x, int y, virtual void DoSetSize( int nX
int width, int height, ,int nY
int sizeFlags = wxSIZE_AUTO); ,int nWidth
}; ,int nHeight
,int nSizeFlags = wxSIZE_AUTO
);
private:
DECLARE_DYNAMIC_CLASS(wxComboBox)
}; // end of CLASS wxComboBox
#endif // wxUSE_COMBOBOX #endif // wxUSE_COMBOBOX
#endif #endif

10
include/wx/os2/control.h
View File

@@ -114,6 +114,16 @@ public:
virtual wxSize DoGetBestSize(void) const; virtual wxSize DoGetBestSize(void) const;
bool OS2CreateControl( wxWindow* pParent
,wxWindowID lId
,const wxPoint& rPos
,const wxSize& rSize
,long lStyle
#if wxUSE_VALIDATORS
,const wxValidator& rValidator
#endif
,const wxString& rsName
);
// //
// Create the control of the given class with the given style, returns FALSE // Create the control of the given class with the given style, returns FALSE
// if creation failed. // if creation failed.

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

@@ -215,6 +215,7 @@ protected:
int m_nFsToolBarHeight; int m_nFsToolBarHeight;
bool m_bFsIsMaximized; bool m_bFsIsMaximized;
bool m_bFsIsShowing; bool m_bFsIsShowing;
bool m_bWasMinimized;
bool m_bIsShown; bool m_bIsShown;
wxWindow* m_pWinLastFocused; wxWindow* m_pWinLastFocused;