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

Notebook, Listbox, and Checklst updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-09-03 04:47:39 +00:00
parent a85030bd90
commit 1de4baa31f
9 changed files with 757 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,61 +17,87 @@
#include "wx/setup.h"
class wxOwnerDrawn; // so the compiler knows, it is a class.
class wxOwnerDrawn; // so the compiler knows, it is a class.
class wxCheckListBoxItem; // fwd decl, define in checklst.cpp
class WXDLLEXPORT wxCheckListBox : public wxListBox
{
DECLARE_DYNAMIC_CLASS(wxCheckListBox)
public:
// ctors
wxCheckListBox();
wxCheckListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int nStrings = 0,
const wxString choices[] = NULL,
long style = 0,
//
// Ctors
//
wxCheckListBox();
wxCheckListBox( wxWindow* pParent
,wxWindowID vId
,const wxPoint& rPos = wxDefaultPosition
,const wxSize& vSize = wxDefaultSize
,int nStrings = 0
,const wxString asChoices[] = NULL
,long lStyle = 0
#if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator,
,const wxValidator& rValidator = wxDefaultValidator
#endif
const wxString& name = wxListBoxNameStr);
,const wxString& rsName = wxListBoxNameStr
);
// override base class virtuals
virtual void Delete(int n);
virtual void InsertItems(int nItems, const wxString items[], int pos);
//
// Override base class virtuals
//
virtual void Delete(int n);
virtual void InsertItems( int nItems
,const wxString asItems[]
,int nPos
);
virtual bool SetFont( const wxFont &font );
virtual bool SetFont(const wxFont &rFont);
// items may be checked
bool IsChecked(size_t uiIndex) const;
void Check(size_t uiIndex, bool bCheck = TRUE);
//
// Items may be checked
//
bool IsChecked(size_t uiIndex) const;
void Check( size_t uiIndex
,bool bCheck = TRUE
);
// accessors
size_t GetItemHeight() const { return m_nItemHeight; }
//
// Accessors
//
size_t GetItemHeight(void) const { return m_nItemHeight; }
protected:
// we create our items ourselves and they have non-standard size,
// so we need to override these functions
virtual wxOwnerDrawn *CreateItem(size_t n);
// virtual bool OS2OnMeasure(WXMEASUREITEMSTRUCT *item);
//
// We create our items ourselves and they have non-standard size,
// so we need to override these functions
//
virtual wxOwnerDrawn* CreateItem(size_t n);
virtual bool OS2OnMeasure(WXMEASUREITEMSTRUCT* pItem);
// pressing space or clicking the check box toggles the item
void OnChar(wxKeyEvent& event);
void OnLeftClick(wxMouseEvent& event);
//
// Pressing space or clicking the check box toggles the item
//
void OnChar(wxKeyEvent& rEvent);
void OnLeftClick(wxMouseEvent& rEvent);
private:
size_t m_nItemHeight; // height of checklistbox items (the same for all)
size_t m_nItemHeight; // height of checklistbox items (the same for all)
//Virtual function hiding suppression, do not use
virtual wxControl *CreateItem(const wxItemResource* childResource,
const wxItemResource* parentResource,
const wxResourceTable *table = (const wxResourceTable *) NULL)
{ return(wxWindowBase::CreateItem(childResource, parentResource, table));};
DECLARE_EVENT_TABLE()
};
//
// Virtual function hiding suppression, do not use
//
virtual wxControl* CreateItem( const wxItemResource* pChildResource
,const wxItemResource* pParentResource
,const wxResourceTable* pTable = (const wxResourceTable *) NULL
)
{
return(wxWindowBase::CreateItem( pChildResource
,pParentResource
,pTable
));
}
DECLARE_DYNAMIC_CLASS(wxCheckListBox)
DECLARE_EVENT_TABLE()
}; // end of CLASS wxCheckListBoxItem
#endif
// _WX_CHECKLST_H_

2
include/wx/os2/statbmp.h
View File

@@ -62,6 +62,7 @@ class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
,WXWPARAM wParam
,WXLPARAM lParam
);
void OnPaint(wxPaintEvent& rEvent);
protected:
virtual wxSize DoGetBestSize() const;
@@ -79,6 +80,7 @@ protected:
wxGDIImage* m_pImage;
private:
DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
DECLARE_EVENT_TABLE()
}; // end of wxStaticBitmap
#endif

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

@@ -227,9 +227,6 @@ public:
void OnIdle(wxIdleEvent& rEvent);
public:
// For hidden notebook pages, always TRUE for everything else
bool IsActivePage(void) const { return m_bIsActivePage; }
void SetActivePage(bool bActive) { m_bIsActivePage = bActive; }
// For implementation purposes - sometimes decorations make the client area
// smaller
@@ -606,7 +603,6 @@ private:
HWND m_hWndScrollBarHorz;
HWND m_hWndScrollBarVert;
SWP m_vWinSwp;
bool m_bIsActivePage;
DECLARE_DYNAMIC_CLASS(wxWindowOS2);
DECLARE_NO_COPY_CLASS(wxWindowOS2)