Implementing some more controls and an MDI child frame fix for wxFrame.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
parent
f6c2a6f418
commit
fb49f3b32e
@ -23,57 +23,91 @@ public:
|
||||
// ctors
|
||||
inline wxChoice() { }
|
||||
|
||||
inline wxChoice(wxWindow *parent, wxWindowID id,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
int n = 0, const wxString choices[] = NULL,
|
||||
long style = 0,
|
||||
inline wxChoice( wxWindow* pParent
|
||||
,wxWindowID vId
|
||||
,const wxPoint& rPos = wxDefaultPosition
|
||||
,const wxSize& rSize = wxDefaultSize
|
||||
,int n = 0
|
||||
,const wxString asChoices[] = NULL
|
||||
,long lStyle = 0
|
||||
#if wxUSE_VALIDATORS
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
,const wxValidator& rValidator = wxDefaultValidator
|
||||
#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,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
int n = 0, const wxString choices[] = NULL,
|
||||
long style = 0,
|
||||
bool Create( wxWindow* pParent
|
||||
,wxWindowID vId
|
||||
,const wxPoint& rPos = wxDefaultPosition
|
||||
,const wxSize& rSize = wxDefaultSize
|
||||
,int n = 0
|
||||
,const wxString asChoices[] = NULL
|
||||
,long lStyle = 0
|
||||
#if wxUSE_VALIDATORS
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
,const wxValidator& rValidator = wxDefaultValidator
|
||||
#endif
|
||||
const wxString& name = wxChoiceNameStr);
|
||||
,const wxString& rsName = wxChoiceNameStr
|
||||
);
|
||||
|
||||
//
|
||||
// Implement base class virtuals
|
||||
virtual int DoAppend(const wxString& item);
|
||||
virtual void Delete(int n);
|
||||
virtual void Clear();
|
||||
//
|
||||
virtual int DoAppend(const wxString& rsItem);
|
||||
virtual void Delete(int n);
|
||||
virtual void Clear(void);
|
||||
|
||||
virtual int GetCount() const;
|
||||
virtual int GetSelection() const ;
|
||||
virtual void SetSelection(int n);
|
||||
virtual int GetCount(void) const;
|
||||
virtual int GetSelection(void) const ;
|
||||
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 void SetString(int n, const wxString& s);
|
||||
virtual void SetString( int n
|
||||
,const wxString& rsStr
|
||||
);
|
||||
|
||||
//
|
||||
// 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:
|
||||
virtual void DoSetItemClientData( int n, void* clientData );
|
||||
virtual void* DoGetItemClientData( int n ) const;
|
||||
virtual void DoSetItemClientObject( int n, wxClientData* clientData );
|
||||
virtual wxClientData* DoGetItemClientObject( int n ) const;
|
||||
|
||||
// OS2 implementation
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual void DoSetSize(int x, int y,
|
||||
int width, int height,
|
||||
int sizeFlags = wxSIZE_AUTO);
|
||||
};
|
||||
virtual void DoSetItemClientData( int n
|
||||
,void* pClientData
|
||||
);
|
||||
virtual void* DoGetItemClientData(int n) const;
|
||||
virtual void DoSetItemClientObject( int n
|
||||
,wxClientData* pClientData
|
||||
);
|
||||
virtual wxClientData* DoGetItemClientObject(int n) const;
|
||||
virtual wxSize DoGetBestSize(void) const;
|
||||
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_
|
||||
|
||||
@ -20,64 +20,103 @@ WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr;
|
||||
WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
|
||||
|
||||
// Combobox item
|
||||
class WXDLLEXPORT wxComboBox: public wxChoice
|
||||
class WXDLLEXPORT wxComboBox : public wxChoice
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxComboBox)
|
||||
|
||||
public:
|
||||
inline wxComboBox() {}
|
||||
|
||||
inline wxComboBox(wxWindow *parent, wxWindowID id,
|
||||
const wxString& value = wxEmptyString,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
int n = 0, const wxString choices[] = NULL,
|
||||
long style = 0,
|
||||
inline wxComboBox( 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& validator = wxDefaultValidator,
|
||||
,const wxValidator& rValidator = wxDefaultValidator
|
||||
#endif
|
||||
const wxString& name = wxComboBoxNameStr)
|
||||
{
|
||||
Create(parent, id, value, pos, size, n, choices, style, validator, name);
|
||||
}
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id,
|
||||
const wxString& value = wxEmptyString,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
int n = 0, const wxString choices[] = NULL,
|
||||
long style = 0,
|
||||
,const wxString& rsName = wxComboBoxNameStr
|
||||
)
|
||||
{
|
||||
Create( pParent
|
||||
,vId
|
||||
,rsValue
|
||||
,rPos
|
||||
,rSize
|
||||
,n
|
||||
,asChoices
|
||||
,lStyle
|
||||
#if wxUSE_VALIDATORS
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
,rValidator
|
||||
#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
|
||||
//
|
||||
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
|
||||
//
|
||||
virtual void Copy();
|
||||
virtual void Cut();
|
||||
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:
|
||||
virtual void DoSetSize(int x, int y,
|
||||
int width, int height,
|
||||
int sizeFlags = wxSIZE_AUTO);
|
||||
};
|
||||
virtual void DoSetSize( int nX
|
||||
,int nY
|
||||
,int nWidth
|
||||
,int nHeight
|
||||
,int nSizeFlags = wxSIZE_AUTO
|
||||
);
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxComboBox)
|
||||
}; // end of CLASS wxComboBox
|
||||
|
||||
#endif // wxUSE_COMBOBOX
|
||||
#endif
|
||||
|
||||
@ -114,6 +114,16 @@ public:
|
||||
|
||||
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
|
||||
// if creation failed.
|
||||
|
||||
@ -215,6 +215,7 @@ protected:
|
||||
int m_nFsToolBarHeight;
|
||||
bool m_bFsIsMaximized;
|
||||
bool m_bFsIsShowing;
|
||||
bool m_bWasMinimized;
|
||||
bool m_bIsShown;
|
||||
wxWindow* m_pWinLastFocused;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user