projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor listbox event sending code to avoid duplication.
[wxWidgets.git]
/
include
/
wx
/
os2
/
control.h
diff --git
a/include/wx/os2/control.h
b/include/wx/os2/control.h
index 496c2701919e9c04432f339520e6ff5475211787..0fc4ceeba5bb70f030183291e0c5e308182ae198 100644
(file)
--- a/
include/wx/os2/control.h
+++ b/
include/wx/os2/control.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: control.h
+// Name:
wx/os2/
control.h
// Purpose: wxControl class
// Author: David Webster
// Modified by:
// Purpose: wxControl class
// Author: David Webster
// Modified by:
@@
-15,7
+15,7
@@
#include "wx/dynarray.h"
// General item class
#include "wx/dynarray.h"
// General item class
-class WXDLL
EXPORT
wxControl : public wxControlBase
+class WXDLL
IMPEXP_CORE
wxControl : public wxControlBase
{
DECLARE_ABSTRACT_CLASS(wxControl)
{
DECLARE_ABSTRACT_CLASS(wxControl)
@@
-30,16
+30,8
@@
public:
,const wxString& rsName = wxControlNameStr
)
{
,const wxString& rsName = wxControlNameStr
)
{
- Create( pParent
- ,vId
- ,rPos
- ,rSize
- ,lStyle
- ,rValidator
- ,rsName
- );
+ Create( pParent, vId, rPos, rSize, lStyle, rValidator, rsName );
}
}
- virtual ~wxControl();
bool Create( wxWindow* pParent
,wxWindowID vId
bool Create( wxWindow* pParent
,wxWindowID vId
@@
-50,6
+42,9
@@
public:
,const wxString& rsName = wxControlNameStr
);
,const wxString& rsName = wxControlNameStr
);
+ virtual void SetLabel(const wxString& rsLabel);
+ virtual wxString GetLabel() const { return m_label; }
+
//
// Simulates an event
//
//
// Simulates an event
//
@@
-68,7
+63,7
@@
public:
//
// For ownerdraw items
//
//
// For ownerdraw items
//
- virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return
FALSE
; };
+ virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return
false
; };
virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; };
wxArrayLong& GetSubcontrols() { return m_aSubControls; }
virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; };
wxArrayLong& GetSubcontrols() { return m_aSubControls; }
@@
-99,7
+94,7
@@
public:
,long lStyle
);
//
,long lStyle
);
//
- // 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.
//
bool OS2CreateControl( const wxChar* zClassname
// if creation failed.
//
bool OS2CreateControl( const wxChar* zClassname
@@
-123,10
+118,13
@@
public:
inline void SetYComp(const int nYComp) {m_nYComp = nYComp;}
private:
inline void SetYComp(const int nYComp) {m_nYComp = nYComp;}
private:
- int m_nXComp;
- int m_nYComp;
- DECLARE_EVENT_TABLE()
+ int m_nXComp;
+ int m_nYComp;
+
+ wxString m_label;
+ WXDWORD m_dwStyle;
+
+ DECLARE_EVENT_TABLE()
}; // end of wxControl
#endif // _WX_CONTROL_H_
}; // end of wxControl
#endif // _WX_CONTROL_H_
-