Applied patch [ 832096 ] Final separation for GUI and console for Open Watcom
(Watcom compiler doesn't like ctor implementation in headers) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -29,10 +29,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
 | 
				
			|||||||
class WXDLLEXPORT wxBitmapButtonBase : public wxButton
 | 
					class WXDLLEXPORT wxBitmapButtonBase : public wxButton
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxBitmapButtonBase()
 | 
					    wxBitmapButtonBase();
 | 
				
			||||||
        : m_bmpNormal(), m_bmpSelected(), m_bmpFocus(), m_bmpDisabled()
 | 
					 | 
				
			||||||
        , m_marginX(0), m_marginY(0)
 | 
					 | 
				
			||||||
        { }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // set the bitmaps
 | 
					    // set the bitmaps
 | 
				
			||||||
    void SetBitmapLabel(const wxBitmap& bitmap)
 | 
					    void SetBitmapLabel(const wxBitmap& bitmap)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -41,22 +41,14 @@ public:
 | 
				
			|||||||
    // construction
 | 
					    // construction
 | 
				
			||||||
    // ------------
 | 
					    // ------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxBookCtrl()
 | 
					    wxBookCtrl();
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxBookCtrl(wxWindow *parent,
 | 
					    wxBookCtrl(wxWindow *parent,
 | 
				
			||||||
               wxWindowID winid,
 | 
					               wxWindowID winid,
 | 
				
			||||||
               const wxPoint& pos = wxDefaultPosition,
 | 
					               const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
               const wxSize& size = wxDefaultSize,
 | 
					               const wxSize& size = wxDefaultSize,
 | 
				
			||||||
               long style = 0,
 | 
					               long style = 0,
 | 
				
			||||||
               const wxString& name = wxEmptyString)
 | 
					               const wxString& name = wxEmptyString);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        (void)Create(parent, winid, pos, size, style, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // quasi ctor
 | 
					    // quasi ctor
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -48,7 +48,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
 | 
				
			|||||||
class WXDLLEXPORT wxButtonBase : public wxControl
 | 
					class WXDLLEXPORT wxButtonBase : public wxControl
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxButtonBase() { }
 | 
					    wxButtonBase();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // show the image in the button in addition to the label
 | 
					    // show the image in the button in addition to the label
 | 
				
			||||||
    virtual void SetImageLabel(const wxBitmap& WXUNUSED(bitmap)) { }
 | 
					    virtual void SetImageLabel(const wxBitmap& WXUNUSED(bitmap)) { }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -58,7 +58,7 @@ WXDLLEXPORT_DATA(extern const wxChar *) wxCheckBoxNameStr;
 | 
				
			|||||||
class WXDLLEXPORT wxCheckBoxBase : public wxControl
 | 
					class WXDLLEXPORT wxCheckBoxBase : public wxControl
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxCheckBoxBase() { }
 | 
					    wxCheckBoxBase();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // set/get the checked status of the listbox
 | 
					    // set/get the checked status of the listbox
 | 
				
			||||||
    virtual void SetValue(bool value) = 0;
 | 
					    virtual void SetValue(bool value) = 0;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,7 +23,7 @@
 | 
				
			|||||||
class WXDLLEXPORT wxCheckListBoxBase : public wxListBox
 | 
					class WXDLLEXPORT wxCheckListBoxBase : public wxListBox
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxCheckListBoxBase() { }
 | 
					    wxCheckListBoxBase();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // check list box specific methods
 | 
					    // check list box specific methods
 | 
				
			||||||
    virtual bool IsChecked(size_t item) const = 0;
 | 
					    virtual bool IsChecked(size_t item) const = 0;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -37,7 +37,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
 | 
				
			|||||||
class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
 | 
					class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxChoiceBase() { }
 | 
					    wxChoiceBase();
 | 
				
			||||||
    virtual ~wxChoiceBase();
 | 
					    virtual ~wxChoiceBase();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // all generic methods are in wxControlWithItems
 | 
					    // all generic methods are in wxControlWithItems
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -35,7 +35,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
 | 
				
			|||||||
class WXDLLEXPORT wxControlBase : public wxWindow
 | 
					class WXDLLEXPORT wxControlBase : public wxWindow
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxControlBase() { }
 | 
					    wxControlBase();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    virtual ~wxControlBase();
 | 
					    virtual ~wxControlBase();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -31,7 +31,7 @@
 | 
				
			|||||||
class WXDLLEXPORT wxItemContainer
 | 
					class WXDLLEXPORT wxItemContainer
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxItemContainer() { m_clientDataItemsType = wxClientData_None; }
 | 
					    wxItemContainer();
 | 
				
			||||||
    virtual ~wxItemContainer();
 | 
					    virtual ~wxItemContainer();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // adding items
 | 
					    // adding items
 | 
				
			||||||
@@ -140,7 +140,7 @@ protected:
 | 
				
			|||||||
class WXDLLEXPORT wxControlWithItems : public wxControl, public wxItemContainer
 | 
					class WXDLLEXPORT wxControlWithItems : public wxControl, public wxItemContainer
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxControlWithItems() { }
 | 
					    wxControlWithItems();
 | 
				
			||||||
    virtual ~wxControlWithItems();
 | 
					    virtual ~wxControlWithItems();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // we have to redefine these functions here to avoid ambiguities in classes
 | 
					    // we have to redefine these functions here to avoid ambiguities in classes
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -25,7 +25,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 | 
				
			|||||||
class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
 | 
					class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxDialogBase() { Init(); }
 | 
					    wxDialogBase();
 | 
				
			||||||
    virtual ~wxDialogBase() { }
 | 
					    virtual ~wxDialogBase() { }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    void Init();
 | 
					    void Init();
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -46,7 +46,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorDefaultWildcardStr;
 | 
				
			|||||||
class WXDLLEXPORT wxFileDialogBase: public wxDialog
 | 
					class WXDLLEXPORT wxFileDialogBase: public wxDialog
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxFileDialogBase () {}
 | 
					    wxFileDialogBase ();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxFileDialogBase(wxWindow *parent,
 | 
					    wxFileDialogBase(wxWindow *parent,
 | 
				
			||||||
                 const wxString& message = wxFileSelectorPromptStr,
 | 
					                 const wxString& message = wxFileSelectorPromptStr,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -38,7 +38,7 @@ class WXDLLEXPORT wxListBox;
 | 
				
			|||||||
class WXDLLEXPORT wxAnyChoiceDialog : public wxDialog
 | 
					class WXDLLEXPORT wxAnyChoiceDialog : public wxDialog
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxAnyChoiceDialog() { }
 | 
					    wxAnyChoiceDialog();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxAnyChoiceDialog(wxWindow *parent,
 | 
					    wxAnyChoiceDialog(wxWindow *parent,
 | 
				
			||||||
                      const wxString& message,
 | 
					                      const wxString& message,
 | 
				
			||||||
@@ -46,11 +46,7 @@ public:
 | 
				
			|||||||
                      int n, const wxString *choices,
 | 
					                      int n, const wxString *choices,
 | 
				
			||||||
                      long styleDlg = wxCHOICEDLG_STYLE,
 | 
					                      long styleDlg = wxCHOICEDLG_STYLE,
 | 
				
			||||||
                      const wxPoint& pos = wxDefaultPosition,
 | 
					                      const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
                      long styleLbox = wxLB_ALWAYS_SB)
 | 
					                      long styleLbox = wxLB_ALWAYS_SB);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        (void)Create(parent, message, caption, n, choices,
 | 
					 | 
				
			||||||
                     styleDlg, pos, styleLbox);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
                const wxString& message,
 | 
					                const wxString& message,
 | 
				
			||||||
@@ -73,10 +69,7 @@ protected:
 | 
				
			|||||||
class WXDLLEXPORT wxSingleChoiceDialog : public wxAnyChoiceDialog
 | 
					class WXDLLEXPORT wxSingleChoiceDialog : public wxAnyChoiceDialog
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxSingleChoiceDialog()
 | 
					    wxSingleChoiceDialog();
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        m_selection = -1;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxSingleChoiceDialog(wxWindow *parent,
 | 
					    wxSingleChoiceDialog(wxWindow *parent,
 | 
				
			||||||
                         const wxString& message,
 | 
					                         const wxString& message,
 | 
				
			||||||
@@ -123,7 +116,7 @@ private:
 | 
				
			|||||||
class WXDLLEXPORT wxMultiChoiceDialog : public wxAnyChoiceDialog
 | 
					class WXDLLEXPORT wxMultiChoiceDialog : public wxAnyChoiceDialog
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxMultiChoiceDialog() { }
 | 
					    wxMultiChoiceDialog();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxMultiChoiceDialog(wxWindow *parent,
 | 
					    wxMultiChoiceDialog(wxWindow *parent,
 | 
				
			||||||
                        const wxString& message,
 | 
					                        const wxString& message,
 | 
				
			||||||
@@ -131,10 +124,7 @@ public:
 | 
				
			|||||||
                        int n,
 | 
					                        int n,
 | 
				
			||||||
                        const wxString *choices,
 | 
					                        const wxString *choices,
 | 
				
			||||||
                        long style = wxCHOICEDLG_STYLE,
 | 
					                        long style = wxCHOICEDLG_STYLE,
 | 
				
			||||||
                        const wxPoint& pos = wxDefaultPosition)
 | 
					                        const wxPoint& pos = wxDefaultPosition);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        (void)Create(parent, message, caption, n, choices, style, pos);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
                const wxString& message,
 | 
					                const wxString& message,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -45,7 +45,7 @@ class WXDLLEXPORT wxTextCtrl;
 | 
				
			|||||||
class WXDLLEXPORT wxGenericFileDialog: public wxFileDialogBase
 | 
					class WXDLLEXPORT wxGenericFileDialog: public wxFileDialogBase
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxGenericFileDialog() { }
 | 
					    wxGenericFileDialog();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxGenericFileDialog(wxWindow *parent,
 | 
					    wxGenericFileDialog(wxWindow *parent,
 | 
				
			||||||
                 const wxString& message = wxFileSelectorPromptStr,
 | 
					                 const wxString& message = wxFileSelectorPromptStr,
 | 
				
			||||||
@@ -115,7 +115,7 @@ class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog
 | 
				
			|||||||
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
 | 
					     DECLARE_DYNAMIC_CLASS(wxFileDialog)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
     wxFileDialog() {}
 | 
					     wxFileDialog();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxFileDialog(wxWindow *parent,
 | 
					    wxFileDialog(wxWindow *parent,
 | 
				
			||||||
                 const wxString& message = wxFileSelectorPromptStr,
 | 
					                 const wxString& message = wxFileSelectorPromptStr,
 | 
				
			||||||
@@ -123,10 +123,7 @@ public:
 | 
				
			|||||||
                 const wxString& defaultFile = _T(""),
 | 
					                 const wxString& defaultFile = _T(""),
 | 
				
			||||||
                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
 | 
					                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
 | 
				
			||||||
                 long style = 0,
 | 
					                 long style = 0,
 | 
				
			||||||
                 const wxPoint& pos = wxDefaultPosition)
 | 
					                 const wxPoint& pos = wxDefaultPosition);
 | 
				
			||||||
          :wxGenericFileDialog(parent, message, defaultDir, defaultFile, wildCard, style, pos)
 | 
					 | 
				
			||||||
     {
 | 
					 | 
				
			||||||
     }
 | 
					 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif // USE_GENERIC_FILEDIALOG
 | 
					#endif // USE_GENERIC_FILEDIALOG
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -72,10 +72,7 @@ public:
 | 
				
			|||||||
                const wxSize &size = wxDefaultSize,
 | 
					                const wxSize &size = wxDefaultSize,
 | 
				
			||||||
                long style = wxLC_ICON,
 | 
					                long style = wxLC_ICON,
 | 
				
			||||||
                const wxValidator& validator = wxDefaultValidator,
 | 
					                const wxValidator& validator = wxDefaultValidator,
 | 
				
			||||||
                const wxString &name = wxT("listctrl") )
 | 
					                const wxString &name = wxT("listctrl") );
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Create(parent, winid, pos, size, style, validator, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
    ~wxGenericListCtrl();
 | 
					    ~wxGenericListCtrl();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create( wxWindow *parent,
 | 
					    bool Create( wxWindow *parent,
 | 
				
			||||||
@@ -251,17 +248,14 @@ class WXDLLEXPORT wxListCtrl: public wxGenericListCtrl
 | 
				
			|||||||
    DECLARE_DYNAMIC_CLASS(wxListCtrl)
 | 
					    DECLARE_DYNAMIC_CLASS(wxListCtrl)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxListCtrl() {}
 | 
					    wxListCtrl();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxListCtrl(wxWindow *parent, wxWindowID winid = -1,
 | 
					    wxListCtrl(wxWindow *parent, wxWindowID winid = -1,
 | 
				
			||||||
               const wxPoint& pos = wxDefaultPosition,
 | 
					               const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
               const wxSize& size = wxDefaultSize,
 | 
					               const wxSize& size = wxDefaultSize,
 | 
				
			||||||
               long style = wxLC_ICON,
 | 
					               long style = wxLC_ICON,
 | 
				
			||||||
               const wxValidator &validator = wxDefaultValidator,
 | 
					               const wxValidator &validator = wxDefaultValidator,
 | 
				
			||||||
               const wxString &name = wxT("listctrl") )
 | 
					               const wxString &name = wxT("listctrl") );
 | 
				
			||||||
    : wxGenericListCtrl(parent, winid, pos, size, style, validator, name)
 | 
					 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
#endif // !__WXMSW__ || __WIN16__ || __WXUNIVERSAL__
 | 
					#endif // !__WXMSW__ || __WIN16__ || __WXUNIVERSAL__
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -274,17 +274,14 @@ class wxMDIChildFrame ;
 | 
				
			|||||||
class WXDLLEXPORT wxMDIParentFrame: public wxGenericMDIParentFrame
 | 
					class WXDLLEXPORT wxMDIParentFrame: public wxGenericMDIParentFrame
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxMDIParentFrame() {}
 | 
					    wxMDIParentFrame();
 | 
				
			||||||
    wxMDIParentFrame(wxWindow *parent,
 | 
					    wxMDIParentFrame(wxWindow *parent,
 | 
				
			||||||
                     wxWindowID winid,
 | 
					                     wxWindowID winid,
 | 
				
			||||||
                     const wxString& title,
 | 
					                     const wxString& title,
 | 
				
			||||||
                     const wxPoint& pos = wxDefaultPosition,
 | 
					                     const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
                     const wxSize& size = wxDefaultSize,
 | 
					                     const wxSize& size = wxDefaultSize,
 | 
				
			||||||
                     long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
 | 
					                     long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
 | 
				
			||||||
                     const wxString& name = wxFrameNameStr)
 | 
					                     const wxString& name = wxFrameNameStr) ;
 | 
				
			||||||
        :wxGenericMDIParentFrame(parent, winid, title, pos, size, style, name)
 | 
					 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxMDIChildFrame * GetActiveChild() const ;
 | 
					    wxMDIChildFrame * GetActiveChild() const ;
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
@@ -300,19 +297,14 @@ private:
 | 
				
			|||||||
class WXDLLEXPORT wxMDIChildFrame: public wxGenericMDIChildFrame
 | 
					class WXDLLEXPORT wxMDIChildFrame: public wxGenericMDIChildFrame
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxMDIChildFrame() {}
 | 
					    wxMDIChildFrame();
 | 
				
			||||||
 | 
					 | 
				
			||||||
    wxMDIChildFrame( wxGenericMDIParentFrame *parent,
 | 
					    wxMDIChildFrame( wxGenericMDIParentFrame *parent,
 | 
				
			||||||
                     wxWindowID winid,
 | 
					                     wxWindowID winid,
 | 
				
			||||||
                     const wxString& title,
 | 
					                     const wxString& title,
 | 
				
			||||||
                     const wxPoint& pos = wxDefaultPosition,
 | 
					                     const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
                     const wxSize& size = wxDefaultSize,
 | 
					                     const wxSize& size = wxDefaultSize,
 | 
				
			||||||
                     long style = wxDEFAULT_FRAME_STYLE,
 | 
					                     long style = wxDEFAULT_FRAME_STYLE,
 | 
				
			||||||
                     const wxString& name = wxFrameNameStr )
 | 
					                     const wxString& name = wxFrameNameStr ) ;
 | 
				
			||||||
        :wxGenericMDIChildFrame(parent, winid, title, pos, size, style, name)
 | 
					 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
private:
 | 
					private:
 | 
				
			||||||
    DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 | 
					    DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
@@ -324,12 +316,8 @@ private:
 | 
				
			|||||||
class WXDLLEXPORT wxMDIClientWindow: public wxGenericMDIClientWindow
 | 
					class WXDLLEXPORT wxMDIClientWindow: public wxGenericMDIClientWindow
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxMDIClientWindow() {}
 | 
					    wxMDIClientWindow();
 | 
				
			||||||
 | 
					    wxMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 );
 | 
				
			||||||
    wxMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 )
 | 
					 | 
				
			||||||
        :wxGenericMDIClientWindow(parent, style)
 | 
					 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
private:
 | 
					private:
 | 
				
			||||||
    DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
 | 
					    DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -43,17 +43,13 @@ class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel,
 | 
				
			|||||||
                                            public wxScrollHelper
 | 
					                                            public wxScrollHelper
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxGenericScrolledWindow() : wxScrollHelper(this) { }
 | 
					    wxGenericScrolledWindow();
 | 
				
			||||||
    wxGenericScrolledWindow(wxWindow *parent,
 | 
					    wxGenericScrolledWindow(wxWindow *parent,
 | 
				
			||||||
                     wxWindowID winid = -1,
 | 
					                     wxWindowID winid = -1,
 | 
				
			||||||
                     const wxPoint& pos = wxDefaultPosition,
 | 
					                     const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
                     const wxSize& size = wxDefaultSize,
 | 
					                     const wxSize& size = wxDefaultSize,
 | 
				
			||||||
                     long style = wxScrolledWindowStyle,
 | 
					                     long style = wxScrolledWindowStyle,
 | 
				
			||||||
                     const wxString& name = wxPanelNameStr)
 | 
					                     const wxString& name = wxPanelNameStr);
 | 
				
			||||||
        : wxScrollHelper(this)
 | 
					 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Create(parent, winid, pos, size, style, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    virtual ~wxGenericScrolledWindow();
 | 
					    virtual ~wxGenericScrolledWindow();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -43,7 +43,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxListBoxNameStr;
 | 
				
			|||||||
class WXDLLEXPORT wxListBoxBase : public wxControlWithItems
 | 
					class WXDLLEXPORT wxListBoxBase : public wxControlWithItems
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxListBoxBase() { }
 | 
					    wxListBoxBase();
 | 
				
			||||||
    virtual ~wxListBoxBase();
 | 
					    virtual ~wxListBoxBase();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // all generic methods are in wxControlWithItems, except for the following
 | 
					    // all generic methods are in wxControlWithItems, except for the following
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -37,17 +37,14 @@
 | 
				
			|||||||
class WXDLLEXPORT wxListView : public wxListCtrl
 | 
					class WXDLLEXPORT wxListView : public wxListCtrl
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxListView() { }
 | 
					    wxListView();
 | 
				
			||||||
    wxListView( wxWindow *parent,
 | 
					    wxListView( wxWindow *parent,
 | 
				
			||||||
                wxWindowID winid = -1,
 | 
					                wxWindowID winid = -1,
 | 
				
			||||||
                const wxPoint& pos = wxDefaultPosition,
 | 
					                const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
                const wxSize& size = wxDefaultSize,
 | 
					                const wxSize& size = wxDefaultSize,
 | 
				
			||||||
                long style = wxLC_REPORT,
 | 
					                long style = wxLC_REPORT,
 | 
				
			||||||
                const wxValidator& validator = wxDefaultValidator,
 | 
					                const wxValidator& validator = wxDefaultValidator,
 | 
				
			||||||
                const wxString &name = wxT("listctrl") )
 | 
					                const wxString &name = wxT("listctrl") );
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Create(parent, winid, pos, size, style, validator, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // focus/selection stuff
 | 
					    // focus/selection stuff
 | 
				
			||||||
    // ---------------------
 | 
					    // ---------------------
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -43,17 +43,17 @@ class WXDLLEXPORT wxBitmap : public wxGDIImage
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    // default ctor creates an invalid bitmap, you must Create() it later
 | 
					    // default ctor creates an invalid bitmap, you must Create() it later
 | 
				
			||||||
    wxBitmap() { Init(); }
 | 
					    wxBitmap();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Copy constructors
 | 
					    // Copy constructors
 | 
				
			||||||
    wxBitmap(const wxBitmap& bitmap) { Init(); Ref(bitmap); }
 | 
					    wxBitmap(const wxBitmap& bitmap);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Initialize with raw data
 | 
					    // Initialize with raw data
 | 
				
			||||||
    wxBitmap(const char bits[], int width, int height, int depth = 1);
 | 
					    wxBitmap(const char bits[], int width, int height, int depth = 1);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Initialize with XPM data
 | 
					    // Initialize with XPM data
 | 
				
			||||||
    wxBitmap(const char **data) { CreateFromXpm(data); }
 | 
					    wxBitmap(const char **data);
 | 
				
			||||||
    wxBitmap(char **data) { CreateFromXpm((const char **)data); }
 | 
					    wxBitmap(char **data);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Load a file or resource
 | 
					    // Load a file or resource
 | 
				
			||||||
    wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE);
 | 
					    wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE);
 | 
				
			||||||
@@ -72,18 +72,18 @@ public:
 | 
				
			|||||||
    wxBitmap(int width, int height, const wxDC& dc);
 | 
					    wxBitmap(int width, int height, const wxDC& dc);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if wxUSE_IMAGE
 | 
					#if wxUSE_IMAGE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Convert from wxImage
 | 
					    // Convert from wxImage
 | 
				
			||||||
    wxBitmap(const wxImage& image, int depth = -1)
 | 
					    wxBitmap(const wxImage& image, int depth = -1);
 | 
				
			||||||
        { (void)CreateFromImage(image, depth); }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Create a DDB compatible with the given DC from wxImage
 | 
					    // Create a DDB compatible with the given DC from wxImage
 | 
				
			||||||
    wxBitmap(const wxImage& image, const wxDC& dc)
 | 
					    wxBitmap(const wxImage& image, const wxDC& dc);
 | 
				
			||||||
        { (void)CreateFromImage(image, dc); }
 | 
					
 | 
				
			||||||
#endif // wxUSE_IMAGE
 | 
					#endif // wxUSE_IMAGE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // we must have this, otherwise icons are silently copied into bitmaps using
 | 
					    // we must have this, otherwise icons are silently copied into bitmaps using
 | 
				
			||||||
    // the copy ctor but the resulting bitmap is invalid!
 | 
					    // the copy ctor but the resulting bitmap is invalid!
 | 
				
			||||||
    wxBitmap(const wxIcon& icon) { Init(); CopyFromIcon(icon); }
 | 
					    wxBitmap(const wxIcon& icon);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxBitmap& operator=(const wxBitmap& bitmap)
 | 
					    wxBitmap& operator=(const wxBitmap& bitmap)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,7 +24,7 @@ class WXDLLEXPORT wxChoice : public wxChoiceBase
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    // ctors
 | 
					    // ctors
 | 
				
			||||||
    wxChoice() { }
 | 
					    wxChoice();
 | 
				
			||||||
    virtual ~wxChoice();
 | 
					    virtual ~wxChoice();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxChoice(wxWindow *parent,
 | 
					    wxChoice(wxWindow *parent,
 | 
				
			||||||
@@ -34,10 +34,7 @@ public:
 | 
				
			|||||||
             int n = 0, const wxString choices[] = NULL,
 | 
					             int n = 0, const wxString choices[] = NULL,
 | 
				
			||||||
             long style = 0,
 | 
					             long style = 0,
 | 
				
			||||||
             const wxValidator& validator = wxDefaultValidator,
 | 
					             const wxValidator& validator = wxDefaultValidator,
 | 
				
			||||||
             const wxString& name = wxChoiceNameStr)
 | 
					             const wxString& name = wxChoiceNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Create(parent, id, pos, size, n, choices, style, validator, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
                wxWindowID id,
 | 
					                wxWindowID id,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -27,7 +27,7 @@
 | 
				
			|||||||
class WXDLLEXPORT wxComboBox: public wxChoice
 | 
					class WXDLLEXPORT wxComboBox: public wxChoice
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxComboBox() { }
 | 
					    wxComboBox();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxComboBox(wxWindow *parent, wxWindowID id,
 | 
					    wxComboBox(wxWindow *parent, wxWindowID id,
 | 
				
			||||||
            const wxString& value = wxEmptyString,
 | 
					            const wxString& value = wxEmptyString,
 | 
				
			||||||
@@ -36,10 +36,7 @@ public:
 | 
				
			|||||||
            int n = 0, const wxString choices[] = NULL,
 | 
					            int n = 0, const wxString choices[] = NULL,
 | 
				
			||||||
            long style = 0,
 | 
					            long style = 0,
 | 
				
			||||||
            const wxValidator& validator = wxDefaultValidator,
 | 
					            const wxValidator& validator = wxDefaultValidator,
 | 
				
			||||||
            const wxString& name = wxComboBoxNameStr)
 | 
					            const wxString& name = wxComboBoxNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Create(parent, id, value, pos, size, n, choices, style, validator, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
                wxWindowID id,
 | 
					                wxWindowID id,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -36,7 +36,7 @@ class WXDLLEXPORT wxGDIRefData : public wxObjectRefData
 | 
				
			|||||||
class WXDLLEXPORT wxGDIObject : public wxObject
 | 
					class WXDLLEXPORT wxGDIObject : public wxObject
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxGDIObject() { m_visible = FALSE; };
 | 
					    wxGDIObject();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Creates the resource
 | 
					    // Creates the resource
 | 
				
			||||||
    virtual bool RealizeResource() { return FALSE; };
 | 
					    virtual bool RealizeResource() { return FALSE; };
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -49,10 +49,7 @@ public:
 | 
				
			|||||||
            int n = 0, const wxString choices[] = NULL,
 | 
					            int n = 0, const wxString choices[] = NULL,
 | 
				
			||||||
            long style = 0,
 | 
					            long style = 0,
 | 
				
			||||||
            const wxValidator& validator = wxDefaultValidator,
 | 
					            const wxValidator& validator = wxDefaultValidator,
 | 
				
			||||||
            const wxString& name = wxListBoxNameStr)
 | 
					            const wxString& name = wxListBoxNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Create(parent, id, pos, size, n, choices, style, validator, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent, wxWindowID id,
 | 
					    bool Create(wxWindow *parent, wxWindowID id,
 | 
				
			||||||
                const wxPoint& pos = wxDefaultPosition,
 | 
					                const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -36,11 +36,7 @@ public:
 | 
				
			|||||||
               int majorDim = 0,
 | 
					               int majorDim = 0,
 | 
				
			||||||
               long style = wxRA_HORIZONTAL,
 | 
					               long style = wxRA_HORIZONTAL,
 | 
				
			||||||
               const wxValidator& val = wxDefaultValidator,
 | 
					               const wxValidator& val = wxDefaultValidator,
 | 
				
			||||||
               const wxString& name = wxRadioBoxNameStr)
 | 
					               const wxString& name = wxRadioBoxNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        (void)Create(parent, id, title, pos, size, n, choices, majorDim,
 | 
					 | 
				
			||||||
                     style, val, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ~wxRadioBox();
 | 
					    ~wxRadioBox();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -20,7 +20,7 @@ class WXDLLEXPORT wxRadioButton: public wxControl
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    // ctors and creation functions
 | 
					    // ctors and creation functions
 | 
				
			||||||
    wxRadioButton() { Init(); }
 | 
					    wxRadioButton();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxRadioButton(wxWindow *parent,
 | 
					    wxRadioButton(wxWindow *parent,
 | 
				
			||||||
                  wxWindowID id,
 | 
					                  wxWindowID id,
 | 
				
			||||||
@@ -29,12 +29,7 @@ public:
 | 
				
			|||||||
                  const wxSize& size = wxDefaultSize,
 | 
					                  const wxSize& size = wxDefaultSize,
 | 
				
			||||||
                  long style = 0,
 | 
					                  long style = 0,
 | 
				
			||||||
                  const wxValidator& validator = wxDefaultValidator,
 | 
					                  const wxValidator& validator = wxDefaultValidator,
 | 
				
			||||||
                  const wxString& name = wxRadioButtonNameStr)
 | 
					                  const wxString& name = wxRadioButtonNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        Create(parent, id, label, pos, size, style, validator, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
                wxWindowID id,
 | 
					                wxWindowID id,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,7 +24,7 @@ class WXDLLEXPORT wxTopLevelWindowMSW : public wxTopLevelWindowBase
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    // constructors and such
 | 
					    // constructors and such
 | 
				
			||||||
    wxTopLevelWindowMSW() { Init(); }
 | 
					    wxTopLevelWindowMSW();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxTopLevelWindowMSW(wxWindow *parent,
 | 
					    wxTopLevelWindowMSW(wxWindow *parent,
 | 
				
			||||||
                        wxWindowID id,
 | 
					                        wxWindowID id,
 | 
				
			||||||
@@ -32,12 +32,7 @@ public:
 | 
				
			|||||||
                        const wxPoint& pos = wxDefaultPosition,
 | 
					                        const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
                        const wxSize& size = wxDefaultSize,
 | 
					                        const wxSize& size = wxDefaultSize,
 | 
				
			||||||
                        long style = wxDEFAULT_FRAME_STYLE,
 | 
					                        long style = wxDEFAULT_FRAME_STYLE,
 | 
				
			||||||
                        const wxString& name = wxFrameNameStr)
 | 
					                        const wxString& name = wxFrameNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        (void)Create(parent, id, title, pos, size, style, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
                wxWindowID id,
 | 
					                wxWindowID id,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -53,18 +53,14 @@ enum
 | 
				
			|||||||
class WXDLLEXPORT wxWindowMSW : public wxWindowBase
 | 
					class WXDLLEXPORT wxWindowMSW : public wxWindowBase
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxWindowMSW() { Init(); }
 | 
					    wxWindowMSW();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxWindowMSW(wxWindow *parent,
 | 
					    wxWindowMSW(wxWindow *parent,
 | 
				
			||||||
                wxWindowID id,
 | 
					                wxWindowID id,
 | 
				
			||||||
                const wxPoint& pos = wxDefaultPosition,
 | 
					                const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
                const wxSize& size = wxDefaultSize,
 | 
					                const wxSize& size = wxDefaultSize,
 | 
				
			||||||
                long style = 0,
 | 
					                long style = 0,
 | 
				
			||||||
                const wxString& name = wxPanelNameStr)
 | 
					                const wxString& name = wxPanelNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
        Create(parent, id, pos, size, style, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    virtual ~wxWindowMSW();
 | 
					    virtual ~wxWindowMSW();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -53,18 +53,14 @@ public:
 | 
				
			|||||||
    // ctors
 | 
					    // ctors
 | 
				
			||||||
    // -----
 | 
					    // -----
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxNotebookBase() { }
 | 
					    wxNotebookBase();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxNotebookBase(wxWindow *parent,
 | 
					    wxNotebookBase(wxWindow *parent,
 | 
				
			||||||
                   wxWindowID winid,
 | 
					                   wxWindowID winid,
 | 
				
			||||||
                   const wxPoint& pos = wxDefaultPosition,
 | 
					                   const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
                   const wxSize& size = wxDefaultSize,
 | 
					                   const wxSize& size = wxDefaultSize,
 | 
				
			||||||
                   long style = 0,
 | 
					                   long style = 0,
 | 
				
			||||||
                   const wxString& name = wxNOTEBOOK_NAME)
 | 
					                   const wxString& name = wxNOTEBOOK_NAME) ;
 | 
				
			||||||
        : wxBookCtrl(parent, winid, pos, size, style, name)
 | 
					 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // wxNotebook-specific additions to wxBookCtrl interface
 | 
					    // wxNotebook-specific additions to wxBookCtrl interface
 | 
				
			||||||
    // -----------------------------------------------------
 | 
					    // -----------------------------------------------------
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -217,16 +217,13 @@ protected:
 | 
				
			|||||||
    class WXDLLEXPORT wxScrolledWindow : public wxGenericScrolledWindow
 | 
					    class WXDLLEXPORT wxScrolledWindow : public wxGenericScrolledWindow
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
    public:
 | 
					    public:
 | 
				
			||||||
        wxScrolledWindow() { }
 | 
					        wxScrolledWindow();
 | 
				
			||||||
        wxScrolledWindow(wxWindow *parent,
 | 
					        wxScrolledWindow(wxWindow *parent,
 | 
				
			||||||
                         wxWindowID winid = -1,
 | 
					                         wxWindowID winid = -1,
 | 
				
			||||||
                         const wxPoint& pos = wxDefaultPosition,
 | 
					                         const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
                         const wxSize& size = wxDefaultSize,
 | 
					                         const wxSize& size = wxDefaultSize,
 | 
				
			||||||
                         long style = wxScrolledWindowStyle,
 | 
					                         long style = wxScrolledWindowStyle,
 | 
				
			||||||
                         const wxString& name = wxPanelNameStr)
 | 
					                         const wxString& name = wxPanelNameStr);
 | 
				
			||||||
            : wxGenericScrolledWindow(parent, winid, pos, size, style, name)
 | 
					 | 
				
			||||||
        {
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private:
 | 
					    private:
 | 
				
			||||||
        DECLARE_DYNAMIC_CLASS_NO_COPY(wxScrolledWindow)
 | 
					        DECLARE_DYNAMIC_CLASS_NO_COPY(wxScrolledWindow)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,7 +19,7 @@
 | 
				
			|||||||
class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase
 | 
					class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxBitmapButton() { }
 | 
					    wxBitmapButton();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxBitmapButton(wxWindow *parent,
 | 
					    wxBitmapButton(wxWindow *parent,
 | 
				
			||||||
                   wxWindowID id,
 | 
					                   wxWindowID id,
 | 
				
			||||||
@@ -28,10 +28,7 @@ public:
 | 
				
			|||||||
                   const wxSize& size = wxDefaultSize,
 | 
					                   const wxSize& size = wxDefaultSize,
 | 
				
			||||||
                   long style = 0,
 | 
					                   long style = 0,
 | 
				
			||||||
                   const wxValidator& validator = wxDefaultValidator,
 | 
					                   const wxValidator& validator = wxDefaultValidator,
 | 
				
			||||||
                   const wxString& name = wxButtonNameStr)
 | 
					                   const wxString& name = wxButtonNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Create(parent, id, bitmap, pos, size, style, validator, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
                wxWindowID id,
 | 
					                wxWindowID id,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -36,7 +36,7 @@ class WXDLLEXPORT wxInputHandler;
 | 
				
			|||||||
class WXDLLEXPORT wxButton : public wxButtonBase
 | 
					class WXDLLEXPORT wxButton : public wxButtonBase
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxButton() { Init(); }
 | 
					    wxButton();
 | 
				
			||||||
    wxButton(wxWindow *parent,
 | 
					    wxButton(wxWindow *parent,
 | 
				
			||||||
             wxWindowID id,
 | 
					             wxWindowID id,
 | 
				
			||||||
             const wxBitmap& bitmap,
 | 
					             const wxBitmap& bitmap,
 | 
				
			||||||
@@ -45,12 +45,7 @@ public:
 | 
				
			|||||||
             const wxSize& size = wxDefaultSize,
 | 
					             const wxSize& size = wxDefaultSize,
 | 
				
			||||||
             long style = 0,
 | 
					             long style = 0,
 | 
				
			||||||
             const wxValidator& validator = wxDefaultValidator,
 | 
					             const wxValidator& validator = wxDefaultValidator,
 | 
				
			||||||
             const wxString& name = wxButtonNameStr)
 | 
					             const wxString& name = wxButtonNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        Create(parent, id, bitmap, label, pos, size, style, validator, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxButton(wxWindow *parent,
 | 
					    wxButton(wxWindow *parent,
 | 
				
			||||||
             wxWindowID id,
 | 
					             wxWindowID id,
 | 
				
			||||||
@@ -59,12 +54,7 @@ public:
 | 
				
			|||||||
             const wxSize& size = wxDefaultSize,
 | 
					             const wxSize& size = wxDefaultSize,
 | 
				
			||||||
             long style = 0,
 | 
					             long style = 0,
 | 
				
			||||||
             const wxValidator& validator = wxDefaultValidator,
 | 
					             const wxValidator& validator = wxDefaultValidator,
 | 
				
			||||||
             const wxString& name = wxButtonNameStr)
 | 
					             const wxString& name = wxButtonNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        Create(parent, id, label, pos, size, style, validator, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
                wxWindowID id,
 | 
					                wxWindowID id,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -59,7 +59,7 @@ public:
 | 
				
			|||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // constructors
 | 
					    // constructors
 | 
				
			||||||
    wxCheckBox() { Init(); }
 | 
					    wxCheckBox();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxCheckBox(wxWindow *parent,
 | 
					    wxCheckBox(wxWindow *parent,
 | 
				
			||||||
               wxWindowID id,
 | 
					               wxWindowID id,
 | 
				
			||||||
@@ -68,12 +68,7 @@ public:
 | 
				
			|||||||
               const wxSize& size = wxDefaultSize,
 | 
					               const wxSize& size = wxDefaultSize,
 | 
				
			||||||
               long style = 0,
 | 
					               long style = 0,
 | 
				
			||||||
               const wxValidator& validator = wxDefaultValidator,
 | 
					               const wxValidator& validator = wxDefaultValidator,
 | 
				
			||||||
               const wxString& name = wxCheckBoxNameStr)
 | 
					               const wxString& name = wxCheckBoxNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        Create(parent, id, label, pos, size, style, validator, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
                wxWindowID id,
 | 
					                wxWindowID id,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -30,7 +30,7 @@ class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    // ctors
 | 
					    // ctors
 | 
				
			||||||
    wxCheckListBox() { Init(); }
 | 
					    wxCheckListBox();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxCheckListBox(wxWindow *parent,
 | 
					    wxCheckListBox(wxWindow *parent,
 | 
				
			||||||
                   wxWindowID id,
 | 
					                   wxWindowID id,
 | 
				
			||||||
@@ -40,12 +40,7 @@ public:
 | 
				
			|||||||
                   const wxString *choices = NULL,
 | 
					                   const wxString *choices = NULL,
 | 
				
			||||||
                   long style = 0,
 | 
					                   long style = 0,
 | 
				
			||||||
                   const wxValidator& validator = wxDefaultValidator,
 | 
					                   const wxValidator& validator = wxDefaultValidator,
 | 
				
			||||||
                   const wxString& name = wxListBoxNameStr)
 | 
					                   const wxString& name = wxListBoxNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        Create(parent, id, pos, size, nStrings, choices, style, validator, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
                wxWindowID id,
 | 
					                wxWindowID id,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,17 +23,14 @@
 | 
				
			|||||||
class WXDLLEXPORT wxChoice : public wxComboBox
 | 
					class WXDLLEXPORT wxChoice : public wxComboBox
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxChoice() {}
 | 
					    wxChoice();
 | 
				
			||||||
    wxChoice(wxWindow *parent, wxWindowID id,
 | 
					    wxChoice(wxWindow *parent, wxWindowID id,
 | 
				
			||||||
            const wxPoint& pos = wxDefaultPosition,
 | 
					            const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
            const wxSize& size = wxDefaultSize,
 | 
					            const wxSize& size = wxDefaultSize,
 | 
				
			||||||
            int n = 0, const wxString choices[] = (const wxString *) NULL,
 | 
					            int n = 0, const wxString choices[] = (const wxString *) NULL,
 | 
				
			||||||
            long style = 0,
 | 
					            long style = 0,
 | 
				
			||||||
            const wxValidator& validator = wxDefaultValidator,
 | 
					            const wxValidator& validator = wxDefaultValidator,
 | 
				
			||||||
            const wxString& name = wxChoiceNameStr)
 | 
					            const wxString& name = wxChoiceNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Create(parent, id, pos, size, n, choices, style, validator, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent, wxWindowID id,
 | 
					    bool Create(wxWindow *parent, wxWindowID id,
 | 
				
			||||||
                const wxPoint& pos = wxDefaultPosition,
 | 
					                const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -99,10 +99,7 @@ class WXDLLEXPORT wxComboControl : public wxControl
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    // construction
 | 
					    // construction
 | 
				
			||||||
    wxComboControl()
 | 
					    wxComboControl();
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxComboControl(wxWindow *parent,
 | 
					    wxComboControl(wxWindow *parent,
 | 
				
			||||||
                   wxWindowID id,
 | 
					                   wxWindowID id,
 | 
				
			||||||
@@ -111,12 +108,7 @@ public:
 | 
				
			|||||||
                   const wxSize& size = wxDefaultSize,
 | 
					                   const wxSize& size = wxDefaultSize,
 | 
				
			||||||
                   long style = 0,
 | 
					                   long style = 0,
 | 
				
			||||||
                   const wxValidator& validator = wxDefaultValidator,
 | 
					                   const wxValidator& validator = wxDefaultValidator,
 | 
				
			||||||
                   const wxString& name = wxComboBoxNameStr)
 | 
					                   const wxString& name = wxComboBoxNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        (void)Create(parent, id, value, pos, size, style, validator, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
                wxWindowID id,
 | 
					                wxWindowID id,
 | 
				
			||||||
@@ -213,7 +205,7 @@ class WXDLLEXPORT wxComboBox : public wxComboControl, public wxComboBoxBase
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    // ctors and such
 | 
					    // ctors and such
 | 
				
			||||||
    wxComboBox() { Init(); }
 | 
					    wxComboBox();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxComboBox(wxWindow *parent,
 | 
					    wxComboBox(wxWindow *parent,
 | 
				
			||||||
               wxWindowID id,
 | 
					               wxWindowID id,
 | 
				
			||||||
@@ -224,13 +216,7 @@ public:
 | 
				
			|||||||
               const wxString *choices = (const wxString *) NULL,
 | 
					               const wxString *choices = (const wxString *) NULL,
 | 
				
			||||||
               long style = 0,
 | 
					               long style = 0,
 | 
				
			||||||
               const wxValidator& validator = wxDefaultValidator,
 | 
					               const wxValidator& validator = wxDefaultValidator,
 | 
				
			||||||
               const wxString& name = wxComboBoxNameStr)
 | 
					               const wxString& name = wxComboBoxNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        (void)Create(parent, id, value, pos, size, n, choices,
 | 
					 | 
				
			||||||
                     style, validator, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
                wxWindowID id,
 | 
					                wxWindowID id,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -45,19 +45,14 @@ typedef wxString wxControlAction;
 | 
				
			|||||||
class WXDLLEXPORT wxControl : public wxControlBase, public wxInputConsumer
 | 
					class WXDLLEXPORT wxControl : public wxControlBase, public wxInputConsumer
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxControl() { Init(); }
 | 
					    wxControl();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxControl(wxWindow *parent,
 | 
					    wxControl(wxWindow *parent,
 | 
				
			||||||
              wxWindowID id,
 | 
					              wxWindowID id,
 | 
				
			||||||
              const wxPoint& pos = wxDefaultPosition,
 | 
					              const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
              const wxSize& size = wxDefaultSize, long style = 0,
 | 
					              const wxSize& size = wxDefaultSize, long style = 0,
 | 
				
			||||||
              const wxValidator& validator = wxDefaultValidator,
 | 
					              const wxValidator& validator = wxDefaultValidator,
 | 
				
			||||||
              const wxString& name = wxControlNameStr)
 | 
					              const wxString& name = wxControlNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        Create(parent, id, pos, size, style, validator, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
                wxWindowID id,
 | 
					                wxWindowID id,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,7 +23,7 @@ class WXDLLEXPORT wxEventLoop;
 | 
				
			|||||||
class WXDLLEXPORT wxDialog : public wxDialogBase
 | 
					class WXDLLEXPORT wxDialog : public wxDialogBase
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxDialog() { Init(); }
 | 
					    wxDialog();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Constructor with no modal flag - the new convention.
 | 
					    // Constructor with no modal flag - the new convention.
 | 
				
			||||||
    wxDialog(wxWindow *parent, wxWindowID id,
 | 
					    wxDialog(wxWindow *parent, wxWindowID id,
 | 
				
			||||||
@@ -31,11 +31,7 @@ public:
 | 
				
			|||||||
             const wxPoint& pos = wxDefaultPosition,
 | 
					             const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
             const wxSize& size = wxDefaultSize,
 | 
					             const wxSize& size = wxDefaultSize,
 | 
				
			||||||
             long style = wxDEFAULT_DIALOG_STYLE,
 | 
					             long style = wxDEFAULT_DIALOG_STYLE,
 | 
				
			||||||
             const wxString& name = wxDialogNameStr)
 | 
					             const wxString& name = wxDialogNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
        Create(parent, id, title, pos, size, style, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent, wxWindowID id,
 | 
					    bool Create(wxWindow *parent, wxWindowID id,
 | 
				
			||||||
                const wxString& title,
 | 
					                const wxString& title,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,17 +23,14 @@
 | 
				
			|||||||
class WXDLLEXPORT wxFrame : public wxFrameBase
 | 
					class WXDLLEXPORT wxFrame : public wxFrameBase
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxFrame() {}
 | 
					    wxFrame();
 | 
				
			||||||
    wxFrame(wxWindow *parent,
 | 
					    wxFrame(wxWindow *parent,
 | 
				
			||||||
            wxWindowID id,
 | 
					            wxWindowID id,
 | 
				
			||||||
            const wxString& title,
 | 
					            const wxString& title,
 | 
				
			||||||
            const wxPoint& pos = wxDefaultPosition,
 | 
					            const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
            const wxSize& size = wxDefaultSize,
 | 
					            const wxSize& size = wxDefaultSize,
 | 
				
			||||||
            long style = wxDEFAULT_FRAME_STYLE,
 | 
					            long style = wxDEFAULT_FRAME_STYLE,
 | 
				
			||||||
            const wxString& name = wxFrameNameStr)
 | 
					            const wxString& name = wxFrameNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Create(parent, id, title, pos, size, style, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
                wxWindowID id,
 | 
					                wxWindowID id,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -42,7 +42,7 @@ typedef wxString wxControlAction;
 | 
				
			|||||||
class WXDLLEXPORT wxInputConsumer
 | 
					class WXDLLEXPORT wxInputConsumer
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    wxInputConsumer() { m_inputHandler = NULL; }
 | 
					    wxInputConsumer();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // get the input handler
 | 
					    // get the input handler
 | 
				
			||||||
    wxInputHandler *GetInputHandler() const { return m_inputHandler; }
 | 
					    wxInputHandler *GetInputHandler() const { return m_inputHandler; }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -56,7 +56,7 @@ class WXDLLEXPORT wxListBox : public wxListBoxBase, public wxScrollHelper
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    // ctors and such
 | 
					    // ctors and such
 | 
				
			||||||
    wxListBox() { Init(); }
 | 
					    wxListBox();
 | 
				
			||||||
    wxListBox(wxWindow *parent,
 | 
					    wxListBox(wxWindow *parent,
 | 
				
			||||||
              wxWindowID id,
 | 
					              wxWindowID id,
 | 
				
			||||||
              const wxPoint& pos = wxDefaultPosition,
 | 
					              const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
@@ -64,12 +64,7 @@ public:
 | 
				
			|||||||
              int n = 0, const wxString choices[] = (const wxString *) NULL,
 | 
					              int n = 0, const wxString choices[] = (const wxString *) NULL,
 | 
				
			||||||
              long style = 0,
 | 
					              long style = 0,
 | 
				
			||||||
              const wxValidator& validator = wxDefaultValidator,
 | 
					              const wxValidator& validator = wxDefaultValidator,
 | 
				
			||||||
              const wxString& name = wxListBoxNameStr )
 | 
					              const wxString& name = wxListBoxNameStr );
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        Create(parent, id, pos, size, n, choices, style, validator, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    virtual ~wxListBox();
 | 
					    virtual ~wxListBox();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -39,19 +39,14 @@ public:
 | 
				
			|||||||
    // ctors and such
 | 
					    // ctors and such
 | 
				
			||||||
    // --------------
 | 
					    // --------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxNotebook() { Init(); }
 | 
					    wxNotebook();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxNotebook(wxWindow *parent,
 | 
					    wxNotebook(wxWindow *parent,
 | 
				
			||||||
               wxWindowID id,
 | 
					               wxWindowID id,
 | 
				
			||||||
               const wxPoint& pos = wxDefaultPosition,
 | 
					               const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
               const wxSize& size = wxDefaultSize,
 | 
					               const wxSize& size = wxDefaultSize,
 | 
				
			||||||
               long style = 0,
 | 
					               long style = 0,
 | 
				
			||||||
               const wxString& name = wxNOTEBOOK_NAME)
 | 
					               const wxString& name = wxNOTEBOOK_NAME);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        (void)Create(parent, id, pos, size, style, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // quasi ctor
 | 
					    // quasi ctor
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -32,7 +32,7 @@ class WXDLLEXPORT wxRadioBox : public wxStaticBox,
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    // wxRadioBox construction
 | 
					    // wxRadioBox construction
 | 
				
			||||||
    wxRadioBox() { Init(); }
 | 
					    wxRadioBox();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxRadioBox(wxWindow *parent,
 | 
					    wxRadioBox(wxWindow *parent,
 | 
				
			||||||
               wxWindowID id,
 | 
					               wxWindowID id,
 | 
				
			||||||
@@ -43,13 +43,7 @@ public:
 | 
				
			|||||||
               int majorDim = 0,
 | 
					               int majorDim = 0,
 | 
				
			||||||
               long style = wxRA_SPECIFY_COLS,
 | 
					               long style = wxRA_SPECIFY_COLS,
 | 
				
			||||||
               const wxValidator& val = wxDefaultValidator,
 | 
					               const wxValidator& val = wxDefaultValidator,
 | 
				
			||||||
               const wxString& name = wxRadioBoxNameStr)
 | 
					               const wxString& name = wxRadioBoxNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        (void)Create(parent, id, title, pos, size, n, choices,
 | 
					 | 
				
			||||||
                     majorDim, style, val, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
                wxWindowID id,
 | 
					                wxWindowID id,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,7 +26,7 @@ class WXDLLEXPORT wxRadioButton : public wxCheckBox
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    // constructors
 | 
					    // constructors
 | 
				
			||||||
    wxRadioButton() { Init(); }
 | 
					    wxRadioButton();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxRadioButton(wxWindow *parent,
 | 
					    wxRadioButton(wxWindow *parent,
 | 
				
			||||||
                  wxWindowID id,
 | 
					                  wxWindowID id,
 | 
				
			||||||
@@ -35,12 +35,7 @@ public:
 | 
				
			|||||||
                  const wxSize& size = wxDefaultSize,
 | 
					                  const wxSize& size = wxDefaultSize,
 | 
				
			||||||
                  long style = 0,
 | 
					                  long style = 0,
 | 
				
			||||||
                  const wxValidator& validator = wxDefaultValidator,
 | 
					                  const wxValidator& validator = wxDefaultValidator,
 | 
				
			||||||
                  const wxString& name = wxRadioButtonNameStr)
 | 
					                  const wxString& name = wxRadioButtonNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        Create(parent, id, label, pos, size, style, validator, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
                wxWindowID id,
 | 
					                wxWindowID id,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -101,7 +101,7 @@ public:
 | 
				
			|||||||
    // creation
 | 
					    // creation
 | 
				
			||||||
    // --------
 | 
					    // --------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxTextCtrl() { Init(); }
 | 
					    wxTextCtrl();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxTextCtrl(wxWindow *parent,
 | 
					    wxTextCtrl(wxWindow *parent,
 | 
				
			||||||
               wxWindowID id,
 | 
					               wxWindowID id,
 | 
				
			||||||
@@ -110,12 +110,7 @@ public:
 | 
				
			|||||||
               const wxSize& size = wxDefaultSize,
 | 
					               const wxSize& size = wxDefaultSize,
 | 
				
			||||||
               long style = 0,
 | 
					               long style = 0,
 | 
				
			||||||
               const wxValidator& validator = wxDefaultValidator,
 | 
					               const wxValidator& validator = wxDefaultValidator,
 | 
				
			||||||
               const wxString& name = wxTextCtrlNameStr)
 | 
					               const wxString& name = wxTextCtrlNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        Create(parent, id, value, pos, size, style, validator, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
                wxWindowID id,
 | 
					                wxWindowID id,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -39,18 +39,13 @@ class WXDLLEXPORT wxToolBar : public wxToolBarBase
 | 
				
			|||||||
{    
 | 
					{    
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    // construction/destruction
 | 
					    // construction/destruction
 | 
				
			||||||
    wxToolBar() { Init(); }
 | 
					    wxToolBar();
 | 
				
			||||||
    wxToolBar(wxWindow *parent,
 | 
					    wxToolBar(wxWindow *parent,
 | 
				
			||||||
              wxWindowID id,
 | 
					              wxWindowID id,
 | 
				
			||||||
              const wxPoint& pos = wxDefaultPosition,
 | 
					              const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
              const wxSize& size = wxDefaultSize,
 | 
					              const wxSize& size = wxDefaultSize,
 | 
				
			||||||
              long style = 0,
 | 
					              long style = 0,
 | 
				
			||||||
              const wxString& name = wxToolBarNameStr)
 | 
					              const wxString& name = wxToolBarNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        Create(parent, id, pos, size, style, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create( wxWindow *parent,
 | 
					    bool Create( wxWindow *parent,
 | 
				
			||||||
                 wxWindowID id,
 | 
					                 wxWindowID id,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -97,19 +97,14 @@ class WXDLLEXPORT wxTopLevelWindow : public wxTopLevelWindowNative,
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    // construction
 | 
					    // construction
 | 
				
			||||||
    wxTopLevelWindow() { Init(); }
 | 
					    wxTopLevelWindow();
 | 
				
			||||||
    wxTopLevelWindow(wxWindow *parent,
 | 
					    wxTopLevelWindow(wxWindow *parent,
 | 
				
			||||||
                     wxWindowID id,
 | 
					                     wxWindowID id,
 | 
				
			||||||
                     const wxString& title,
 | 
					                     const wxString& title,
 | 
				
			||||||
                     const wxPoint& pos = wxDefaultPosition,
 | 
					                     const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
                     const wxSize& size = wxDefaultSize,
 | 
					                     const wxSize& size = wxDefaultSize,
 | 
				
			||||||
                     long style = wxDEFAULT_FRAME_STYLE,
 | 
					                     long style = wxDEFAULT_FRAME_STYLE,
 | 
				
			||||||
                     const wxString& name = wxFrameNameStr)
 | 
					                     const wxString& name = wxFrameNameStr);
 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        Init();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        Create(parent, id, title, pos, size, style, name);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
                wxWindowID id,
 | 
					                wxWindowID id,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -55,16 +55,14 @@ public:
 | 
				
			|||||||
    // ctors and create functions
 | 
					    // ctors and create functions
 | 
				
			||||||
    // ---------------------------
 | 
					    // ---------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxWindow() { Init(); }
 | 
					    wxWindow();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxWindow(wxWindow *parent,
 | 
					    wxWindow(wxWindow *parent,
 | 
				
			||||||
             wxWindowID id,
 | 
					             wxWindowID id,
 | 
				
			||||||
             const wxPoint& pos = wxDefaultPosition,
 | 
					             const wxPoint& pos = wxDefaultPosition,
 | 
				
			||||||
             const wxSize& size = wxDefaultSize,
 | 
					             const wxSize& size = wxDefaultSize,
 | 
				
			||||||
             long style = 0,
 | 
					             long style = 0,
 | 
				
			||||||
             const wxString& name = wxPanelNameStr)
 | 
					             const wxString& name = wxPanelNameStr);
 | 
				
			||||||
        : wxWindowNative(parent, id, pos, size, style | wxCLIP_CHILDREN, name)
 | 
					 | 
				
			||||||
        { Init(); }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool Create(wxWindow *parent,
 | 
					    bool Create(wxWindow *parent,
 | 
				
			||||||
                wxWindowID id,
 | 
					                wxWindowID id,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,6 +26,16 @@ BEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase)
 | 
				
			|||||||
END_EVENT_TABLE()
 | 
					END_EVENT_TABLE()
 | 
				
			||||||
WX_IMPLEMENT_COCOA_OWNER(wxBitmapButton,NSButton,NSControl,NSView)
 | 
					WX_IMPLEMENT_COCOA_OWNER(wxBitmapButton,NSButton,NSControl,NSView)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBitmapButtonBase::wxBitmapButtonBase()
 | 
				
			||||||
 | 
					                                      : m_bmpNormal(), 
 | 
				
			||||||
 | 
					                                        m_bmpSelected(), 
 | 
				
			||||||
 | 
					                                        m_bmpFocus(), 
 | 
				
			||||||
 | 
					                                        m_bmpDisabled(), 
 | 
				
			||||||
 | 
					                                        m_marginX(0), 
 | 
				
			||||||
 | 
					                                        m_marginY(0)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool wxBitmapButton::Create(wxWindow *parent, wxWindowID winid,
 | 
					bool wxBitmapButton::Create(wxWindow *parent, wxWindowID winid,
 | 
				
			||||||
            const wxBitmap& bitmap, const wxPoint& pos,
 | 
					            const wxBitmap& bitmap, const wxPoint& pos,
 | 
				
			||||||
            const wxSize& size, long style,
 | 
					            const wxSize& size, long style,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -42,6 +42,23 @@
 | 
				
			|||||||
// constructors and destructors
 | 
					// constructors and destructors
 | 
				
			||||||
// ----------------------------------------------------------------------------
 | 
					// ----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBookCtrl::wxBookCtrl()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Init();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBookCtrl::wxBookCtrl(wxWindow *parent,
 | 
				
			||||||
 | 
					                       wxWindowID id,
 | 
				
			||||||
 | 
					                       const wxPoint& pos,
 | 
				
			||||||
 | 
					                       const wxSize& size,
 | 
				
			||||||
 | 
					                       long style,
 | 
				
			||||||
 | 
					                       const wxString& name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Init();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    (void)Create(parent, id, pos, size, style, name);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void wxBookCtrl::Init()
 | 
					void wxBookCtrl::Init()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    m_imageList = NULL;
 | 
					    m_imageList = NULL;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -38,6 +38,10 @@
 | 
				
			|||||||
// implementation
 | 
					// implementation
 | 
				
			||||||
// ============================================================================
 | 
					// ============================================================================
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxChoiceBase::wxChoiceBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wxChoiceBase::~wxChoiceBase()
 | 
					wxChoiceBase::~wxChoiceBase()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    // this destructor is required for Darwin
 | 
					    // this destructor is required for Darwin
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -45,6 +45,10 @@
 | 
				
			|||||||
// implementation
 | 
					// implementation
 | 
				
			||||||
// ============================================================================
 | 
					// ============================================================================
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxControlBase::wxControlBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wxControlBase::~wxControlBase()
 | 
					wxControlBase::~wxControlBase()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    // this destructor is required for Darwin
 | 
					    // this destructor is required for Darwin
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -39,6 +39,11 @@
 | 
				
			|||||||
// implementation
 | 
					// implementation
 | 
				
			||||||
// ============================================================================
 | 
					// ============================================================================
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxItemContainer::wxItemContainer()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    m_clientDataItemsType = wxClientData_None;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wxItemContainer::~wxItemContainer()
 | 
					wxItemContainer::~wxItemContainer()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    // this destructor is required for Darwin
 | 
					    // this destructor is required for Darwin
 | 
				
			||||||
@@ -151,6 +156,10 @@ void *wxItemContainer::GetClientData(int n) const
 | 
				
			|||||||
    return DoGetItemClientData(n);
 | 
					    return DoGetItemClientData(n);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxControlWithItems::wxControlWithItems()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wxControlWithItems::~wxControlWithItems()
 | 
					wxControlWithItems::~wxControlWithItems()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    // this destructor is required for Darwin
 | 
					    // this destructor is required for Darwin
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -53,6 +53,11 @@ END_EVENT_TABLE()
 | 
				
			|||||||
WX_DELEGATE_TO_CONTROL_CONTAINER(wxDialogBase)
 | 
					WX_DELEGATE_TO_CONTROL_CONTAINER(wxDialogBase)
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxDialogBase::wxDialogBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Init();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void wxDialogBase::Init()
 | 
					void wxDialogBase::Init()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    m_returnCode = 0;
 | 
					    m_returnCode = 0;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -36,6 +36,10 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
IMPLEMENT_DYNAMIC_CLASS(wxFileDialogBase, wxDialog)
 | 
					IMPLEMENT_DYNAMIC_CLASS(wxFileDialogBase, wxDialog)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxFileDialogBase::wxFileDialogBase ()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wxFileDialogBase::wxFileDialogBase(wxWindow *parent,
 | 
					wxFileDialogBase::wxFileDialogBase(wxWindow *parent,
 | 
				
			||||||
                                   const wxString& message,
 | 
					                                   const wxString& message,
 | 
				
			||||||
                                   const wxString& defaultDir,
 | 
					                                   const wxString& defaultDir,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -40,6 +40,10 @@
 | 
				
			|||||||
// implementation
 | 
					// implementation
 | 
				
			||||||
// ============================================================================
 | 
					// ============================================================================
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxListBoxBase::wxListBoxBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wxListBoxBase::~wxListBoxBase()
 | 
					wxListBoxBase::~wxListBoxBase()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    // this destructor is required for Darwin
 | 
					    // this destructor is required for Darwin
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -39,6 +39,20 @@
 | 
				
			|||||||
// implementation
 | 
					// implementation
 | 
				
			||||||
// ============================================================================
 | 
					// ============================================================================
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxNotebookBase::wxNotebookBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxNotebookBase::wxNotebookBase(wxWindow *parent,
 | 
				
			||||||
 | 
					                               wxWindowID id,
 | 
				
			||||||
 | 
					                               const wxPoint& pos,
 | 
				
			||||||
 | 
					                               const wxSize& size,
 | 
				
			||||||
 | 
					                               long style,
 | 
				
			||||||
 | 
					                               const wxString& name)
 | 
				
			||||||
 | 
					                               : wxBookCtrl(parent, id, pos, size, style, name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// ----------------------------------------------------------------------------
 | 
					// ----------------------------------------------------------------------------
 | 
				
			||||||
// geometry
 | 
					// geometry
 | 
				
			||||||
// ----------------------------------------------------------------------------
 | 
					// ----------------------------------------------------------------------------
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -238,6 +238,22 @@ size_t wxGetMultipleChoices(wxArrayInt& selections,
 | 
				
			|||||||
// wxAnyChoiceDialog
 | 
					// wxAnyChoiceDialog
 | 
				
			||||||
// ----------------------------------------------------------------------------
 | 
					// ----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxAnyChoiceDialog::wxAnyChoiceDialog()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxAnyChoiceDialog::wxAnyChoiceDialog(wxWindow *parent,
 | 
				
			||||||
 | 
					                                     const wxString& message,
 | 
				
			||||||
 | 
					                                     const wxString& caption,
 | 
				
			||||||
 | 
					                                     int n,
 | 
				
			||||||
 | 
					                                     const wxString *choices,
 | 
				
			||||||
 | 
					                                     long styleDlg,
 | 
				
			||||||
 | 
					                                     const wxPoint& pos,
 | 
				
			||||||
 | 
					                                     long styleLbox)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    (void)Create(parent, message, caption, n, choices, styleDlg, pos, styleLbox);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool wxAnyChoiceDialog::Create(wxWindow *parent,
 | 
					bool wxAnyChoiceDialog::Create(wxWindow *parent,
 | 
				
			||||||
                               const wxString& message,
 | 
					                               const wxString& message,
 | 
				
			||||||
                               const wxString& caption,
 | 
					                               const wxString& caption,
 | 
				
			||||||
@@ -296,6 +312,11 @@ END_EVENT_TABLE()
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
IMPLEMENT_DYNAMIC_CLASS(wxSingleChoiceDialog, wxDialog)
 | 
					IMPLEMENT_DYNAMIC_CLASS(wxSingleChoiceDialog, wxDialog)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxSingleChoiceDialog::wxSingleChoiceDialog()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    m_selection = -1;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
 | 
					wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
 | 
				
			||||||
                                           const wxString& message,
 | 
					                                           const wxString& message,
 | 
				
			||||||
                                           const wxString& caption,
 | 
					                                           const wxString& caption,
 | 
				
			||||||
@@ -366,6 +387,21 @@ void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
IMPLEMENT_DYNAMIC_CLASS(wxMultiChoiceDialog, wxDialog)
 | 
					IMPLEMENT_DYNAMIC_CLASS(wxMultiChoiceDialog, wxDialog)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxMultiChoiceDialog::wxMultiChoiceDialog()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxMultiChoiceDialog::wxMultiChoiceDialog(wxWindow *parent,
 | 
				
			||||||
 | 
					                                         const wxString& message,
 | 
				
			||||||
 | 
					                                         const wxString& caption,
 | 
				
			||||||
 | 
					                                         int n,
 | 
				
			||||||
 | 
					                                         const wxString *choices,
 | 
				
			||||||
 | 
					                                         long style,
 | 
				
			||||||
 | 
					                                         const wxPoint& pos)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    (void)Create(parent, message, caption, n, choices, style, pos);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool wxMultiChoiceDialog::Create( wxWindow *parent,
 | 
					bool wxMultiChoiceDialog::Create( wxWindow *parent,
 | 
				
			||||||
                                  const wxString& message,
 | 
					                                  const wxString& message,
 | 
				
			||||||
                                  const wxString& caption,
 | 
					                                  const wxString& caption,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1146,7 +1146,11 @@ bool wxGenericDirCtrl::ExtractWildcard(const wxString& filterStr, int n, wxStrin
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
int wxGenericDirCtrl::ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions)
 | 
					int wxGenericDirCtrl::ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					#if wxUSE_FILEDLG
 | 
				
			||||||
    return wxFileDialogBase::ParseWildcard(filterStr, descriptions, filters );
 | 
					    return wxFileDialogBase::ParseWildcard(filterStr, descriptions, filters );
 | 
				
			||||||
 | 
					#else
 | 
				
			||||||
 | 
					    return 0;
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void wxGenericDirCtrl::DoResize()
 | 
					void wxGenericDirCtrl::DoResize()
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -835,6 +835,10 @@ END_EVENT_TABLE()
 | 
				
			|||||||
long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST;
 | 
					long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST;
 | 
				
			||||||
bool wxGenericFileDialog::ms_lastShowHidden = FALSE;
 | 
					bool wxGenericFileDialog::ms_lastShowHidden = FALSE;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxGenericFileDialog::wxGenericFileDialog()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
 | 
					wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
 | 
				
			||||||
                           const wxString& message,
 | 
					                           const wxString& message,
 | 
				
			||||||
                           const wxString& defaultDir,
 | 
					                           const wxString& defaultDir,
 | 
				
			||||||
@@ -1364,6 +1368,21 @@ void wxGenericFileDialog::UpdateControls()
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog);
 | 
					IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxFileDialog::wxFileDialog()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxFileDialog::wxFileDialog(wxWindow *parent,
 | 
				
			||||||
 | 
					                           const wxString& message,
 | 
				
			||||||
 | 
					                           const wxString& defaultDir,
 | 
				
			||||||
 | 
					                           const wxString& defaultFile,
 | 
				
			||||||
 | 
					                           const wxString& wildCard,
 | 
				
			||||||
 | 
					                           long style,
 | 
				
			||||||
 | 
					                           const wxPoint& pos)
 | 
				
			||||||
 | 
					          :wxGenericFileDialog(parent, message, defaultDir, defaultFile, wildCard, style, pos)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif // USE_GENERIC_FILEDIALOG
 | 
					#endif // USE_GENERIC_FILEDIALOG
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif // wxUSE_FILEDLG
 | 
					#endif // wxUSE_FILEDLG
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4533,6 +4533,17 @@ wxGenericListCtrl::wxGenericListCtrl()
 | 
				
			|||||||
    m_headerHeight = 0;
 | 
					    m_headerHeight = 0;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxGenericListCtrl::wxGenericListCtrl(wxWindow *parent,
 | 
				
			||||||
 | 
					                                     wxWindowID winid,
 | 
				
			||||||
 | 
					                                     const wxPoint &pos,
 | 
				
			||||||
 | 
					                                     const wxSize &size,
 | 
				
			||||||
 | 
					                                     long style,
 | 
				
			||||||
 | 
					                                     const wxValidator& validator,
 | 
				
			||||||
 | 
					                                     const wxString &name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Create(parent, winid, pos, size, style, validator, name);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wxGenericListCtrl::~wxGenericListCtrl()
 | 
					wxGenericListCtrl::~wxGenericListCtrl()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    if (m_ownsImageListNormal)
 | 
					    if (m_ownsImageListNormal)
 | 
				
			||||||
@@ -5382,5 +5393,39 @@ void wxGenericListCtrl::Thaw()
 | 
				
			|||||||
    m_mainWin->Thaw();
 | 
					    m_mainWin->Thaw();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxListCtrl::wxListCtrl()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxListCtrl::wxListCtrl(wxWindow *parent,
 | 
				
			||||||
 | 
					                       wxWindowID winid,
 | 
				
			||||||
 | 
					                       const wxPoint& pos,
 | 
				
			||||||
 | 
					                       const wxSize& size,
 | 
				
			||||||
 | 
					                       long style,
 | 
				
			||||||
 | 
					                       const wxValidator &validator,
 | 
				
			||||||
 | 
					                       const wxString &name)
 | 
				
			||||||
 | 
					                       : wxGenericListCtrl(parent, winid, pos, size, style, validator, name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // !__WXMSW__ || __WIN16__ || __WXUNIVERSAL__
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxListView::wxListView()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxListView::wxListView(wxWindow *parent,
 | 
				
			||||||
 | 
					                       wxWindowID winid,
 | 
				
			||||||
 | 
					                       const wxPoint& pos,
 | 
				
			||||||
 | 
					                       const wxSize& size,
 | 
				
			||||||
 | 
					                       long style,
 | 
				
			||||||
 | 
					                       const wxValidator& validator,
 | 
				
			||||||
 | 
					                       const wxString &name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Create(parent, winid, pos, size, style, validator, name);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif // wxUSE_LISTCTRL
 | 
					#endif // wxUSE_LISTCTRL
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -797,6 +797,46 @@ void wxGenericMDIClientWindow::OnSize(wxSizeEvent& event)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#if wxUSE_GENERIC_MDI_AS_NATIVE
 | 
					#if wxUSE_GENERIC_MDI_AS_NATIVE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxMDIParentFrame::wxMDIParentFrame()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxMDIParentFrame::wxMDIParentFrame(wxWindow *parent,
 | 
				
			||||||
 | 
					                                   wxWindowID id,
 | 
				
			||||||
 | 
					                                   const wxString& title,
 | 
				
			||||||
 | 
					                                   const wxPoint& pos,
 | 
				
			||||||
 | 
					                                   const wxSize& size,
 | 
				
			||||||
 | 
					                                   long style,
 | 
				
			||||||
 | 
					                                   const wxString& name)
 | 
				
			||||||
 | 
					                                   :wxGenericMDIParentFrame(parent, id, title, pos, size, style, name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxMDIChildFrame::wxMDIChildFrame()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxMDIClientWindow::wxMDIClientWindow()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxMDIClientWindow::wxMDIClientWindow(wxGenericMDIParentFrame *parent,
 | 
				
			||||||
 | 
					                                     long style)
 | 
				
			||||||
 | 
					                                     :wxGenericMDIClientWindow(parent, style)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxMDIChildFrame::wxMDIChildFrame(wxGenericMDIParentFrame *parent,
 | 
				
			||||||
 | 
					                                 wxWindowID id,
 | 
				
			||||||
 | 
					                                 const wxString& title,
 | 
				
			||||||
 | 
					                                 const wxPoint& pos,
 | 
				
			||||||
 | 
					                                 const wxSize& size,
 | 
				
			||||||
 | 
					                                 long style,
 | 
				
			||||||
 | 
					                                 const wxString& name)
 | 
				
			||||||
 | 
					                                 :wxGenericMDIChildFrame(parent, id, title, pos, size, style, name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wxMDIChildFrame * wxMDIParentFrame::GetActiveChild() const
 | 
					wxMDIChildFrame * wxMDIParentFrame::GetActiveChild() const
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        wxGenericMDIChildFrame *pGFrame = wxGenericMDIParentFrame::GetActiveChild();
 | 
					        wxGenericMDIChildFrame *pGFrame = wxGenericMDIParentFrame::GetActiveChild();
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -261,6 +261,7 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 | 
				
			|||||||
    // and the standard print dialog. The global printing 'mode'
 | 
					    // and the standard print dialog. The global printing 'mode'
 | 
				
			||||||
    // is determined by whether the user checks Print to file
 | 
					    // is determined by whether the user checks Print to file
 | 
				
			||||||
    // or not.
 | 
					    // or not.
 | 
				
			||||||
 | 
					#if wxUSE_FILEDLG
 | 
				
			||||||
    if (m_printDialogData.GetPrintToFile())
 | 
					    if (m_printDialogData.GetPrintToFile())
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_FILE);
 | 
					        m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_FILE);
 | 
				
			||||||
@@ -274,6 +275,7 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 | 
				
			|||||||
        m_printDialogData.GetPrintData().SetFilename( dialog.GetPath() );
 | 
					        m_printDialogData.GetPrintData().SetFilename( dialog.GetPath() );
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    else
 | 
					    else
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER);
 | 
					        m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1202,6 +1202,21 @@ BEGIN_EVENT_TABLE(wxGenericScrolledWindow, wxPanel)
 | 
				
			|||||||
    EVT_PAINT(wxGenericScrolledWindow::OnPaint)
 | 
					    EVT_PAINT(wxGenericScrolledWindow::OnPaint)
 | 
				
			||||||
END_EVENT_TABLE()
 | 
					END_EVENT_TABLE()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxGenericScrolledWindow::wxGenericScrolledWindow() : wxScrollHelper(this)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxGenericScrolledWindow::wxGenericScrolledWindow(wxWindow *parent,
 | 
				
			||||||
 | 
					                         wxWindowID winid,
 | 
				
			||||||
 | 
					                         const wxPoint& pos,
 | 
				
			||||||
 | 
					                         const wxSize& size,
 | 
				
			||||||
 | 
					                         long style,
 | 
				
			||||||
 | 
					                         const wxString& name)
 | 
				
			||||||
 | 
					                         : wxScrollHelper(this)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Create(parent, winid, pos, size, style, name);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool wxGenericScrolledWindow::Create(wxWindow *parent,
 | 
					bool wxGenericScrolledWindow::Create(wxWindow *parent,
 | 
				
			||||||
                              wxWindowID id,
 | 
					                              wxWindowID id,
 | 
				
			||||||
                              const wxPoint& pos,
 | 
					                              const wxPoint& pos,
 | 
				
			||||||
@@ -1277,6 +1292,24 @@ wxGenericScrolledWindow::MSWWindowProc(WXUINT nMsg,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#endif // __WXMSW__
 | 
					#endif // __WXMSW__
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// ----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					// wxScrolledWindow implementation
 | 
				
			||||||
 | 
					// ----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxScrolledWindow::wxScrolledWindow()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxScrolledWindow::wxScrolledWindow(wxWindow *parent,
 | 
				
			||||||
 | 
					                                   wxWindowID winid,
 | 
				
			||||||
 | 
					                                   const wxPoint& pos,
 | 
				
			||||||
 | 
					                                   const wxSize& size,
 | 
				
			||||||
 | 
					                                   long style,
 | 
				
			||||||
 | 
					                                   const wxString& name)
 | 
				
			||||||
 | 
					                                   : wxGenericScrolledWindow(parent, winid, pos, size, style, name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif // !wxGTK
 | 
					#endif // !wxGTK
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// vi:sts=4:sw=4:et
 | 
					// vi:sts=4:sw=4:et
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -112,6 +112,16 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
 | 
					IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBitmapButtonBase::wxBitmapButtonBase()
 | 
				
			||||||
 | 
					                                      : m_bmpNormal(), 
 | 
				
			||||||
 | 
					                                        m_bmpSelected(), 
 | 
				
			||||||
 | 
					                                        m_bmpFocus(), 
 | 
				
			||||||
 | 
					                                        m_bmpDisabled(), 
 | 
				
			||||||
 | 
					                                        m_marginX(0), 
 | 
				
			||||||
 | 
					                                        m_marginY(0)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void wxBitmapButton::Init()
 | 
					void wxBitmapButton::Init()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    m_hasFocus =
 | 
					    m_hasFocus =
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -62,6 +62,10 @@ static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckB
 | 
				
			|||||||
// wxCheckBox
 | 
					// wxCheckBox
 | 
				
			||||||
//-----------------------------------------------------------------------------
 | 
					//-----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxCheckBoxBase::wxCheckBoxBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
 | 
					IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wxCheckBox::wxCheckBox()
 | 
					wxCheckBox::wxCheckBox()
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,6 +24,14 @@
 | 
				
			|||||||
#include <gdk/gdk.h>
 | 
					#include <gdk/gdk.h>
 | 
				
			||||||
#include <gtk/gtk.h>
 | 
					#include <gtk/gtk.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					//-----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					// wxCheckListBoxBase
 | 
				
			||||||
 | 
					//-----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxCheckListBoxBase::wxCheckListBoxBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
//-----------------------------------------------------------------------------
 | 
					//-----------------------------------------------------------------------------
 | 
				
			||||||
// wxCheckListBox
 | 
					// wxCheckListBox
 | 
				
			||||||
//-----------------------------------------------------------------------------
 | 
					//-----------------------------------------------------------------------------
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -112,6 +112,16 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
 | 
					IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBitmapButtonBase::wxBitmapButtonBase()
 | 
				
			||||||
 | 
					                                      : m_bmpNormal(), 
 | 
				
			||||||
 | 
					                                        m_bmpSelected(), 
 | 
				
			||||||
 | 
					                                        m_bmpFocus(), 
 | 
				
			||||||
 | 
					                                        m_bmpDisabled(), 
 | 
				
			||||||
 | 
					                                        m_marginX(0), 
 | 
				
			||||||
 | 
					                                        m_marginY(0)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void wxBitmapButton::Init()
 | 
					void wxBitmapButton::Init()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    m_hasFocus =
 | 
					    m_hasFocus =
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -62,6 +62,10 @@ static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckB
 | 
				
			|||||||
// wxCheckBox
 | 
					// wxCheckBox
 | 
				
			||||||
//-----------------------------------------------------------------------------
 | 
					//-----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxCheckBoxBase::wxCheckBoxBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
 | 
					IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wxCheckBox::wxCheckBox()
 | 
					wxCheckBox::wxCheckBox()
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,6 +24,14 @@
 | 
				
			|||||||
#include <gdk/gdk.h>
 | 
					#include <gdk/gdk.h>
 | 
				
			||||||
#include <gtk/gtk.h>
 | 
					#include <gtk/gtk.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					//-----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					// wxCheckListBoxBase
 | 
				
			||||||
 | 
					//-----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxCheckListBoxBase::wxCheckListBoxBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
//-----------------------------------------------------------------------------
 | 
					//-----------------------------------------------------------------------------
 | 
				
			||||||
// wxCheckListBox
 | 
					// wxCheckListBox
 | 
				
			||||||
//-----------------------------------------------------------------------------
 | 
					//-----------------------------------------------------------------------------
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,6 +23,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 | 
				
			|||||||
#include "wx/mac/uma.h"
 | 
					#include "wx/mac/uma.h"
 | 
				
			||||||
#include "wx/bitmap.h"
 | 
					#include "wx/bitmap.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBitmapButtonBase::wxBitmapButtonBase()
 | 
				
			||||||
 | 
					                                      : m_bmpNormal(), 
 | 
				
			||||||
 | 
					                                        m_bmpSelected(), 
 | 
				
			||||||
 | 
					                                        m_bmpFocus(), 
 | 
				
			||||||
 | 
					                                        m_bmpDisabled(), 
 | 
				
			||||||
 | 
					                                        m_marginX(0), 
 | 
				
			||||||
 | 
					                                        m_marginY(0)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
 | 
					bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
 | 
				
			||||||
           const wxPoint& pos,
 | 
					           const wxPoint& pos,
 | 
				
			||||||
           const wxSize& size, long style,
 | 
					           const wxSize& size, long style,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -28,6 +28,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 | 
				
			|||||||
static const int kMacOSXHorizontalBorder = 2 ;
 | 
					static const int kMacOSXHorizontalBorder = 2 ;
 | 
				
			||||||
static const int kMacOSXVerticalBorder = 4 ;
 | 
					static const int kMacOSXVerticalBorder = 4 ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxButtonBase::wxButtonBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 | 
					bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 | 
				
			||||||
           const wxPoint& pos,
 | 
					           const wxPoint& pos,
 | 
				
			||||||
           const wxSize& size, long style,
 | 
					           const wxSize& size, long style,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,6 +23,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 | 
				
			|||||||
#include "wx/mac/uma.h"
 | 
					#include "wx/mac/uma.h"
 | 
				
			||||||
#include "wx/bitmap.h"
 | 
					#include "wx/bitmap.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBitmapButtonBase::wxBitmapButtonBase()
 | 
				
			||||||
 | 
					                                      : m_bmpNormal(), 
 | 
				
			||||||
 | 
					                                        m_bmpSelected(), 
 | 
				
			||||||
 | 
					                                        m_bmpFocus(), 
 | 
				
			||||||
 | 
					                                        m_bmpDisabled(), 
 | 
				
			||||||
 | 
					                                        m_marginX(0), 
 | 
				
			||||||
 | 
					                                        m_marginY(0)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
 | 
					bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
 | 
				
			||||||
           const wxPoint& pos,
 | 
					           const wxPoint& pos,
 | 
				
			||||||
           const wxSize& size, long style,
 | 
					           const wxSize& size, long style,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -28,6 +28,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 | 
				
			|||||||
static const int kMacOSXHorizontalBorder = 2 ;
 | 
					static const int kMacOSXHorizontalBorder = 2 ;
 | 
				
			||||||
static const int kMacOSXVerticalBorder = 4 ;
 | 
					static const int kMacOSXVerticalBorder = 4 ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxButtonBase::wxButtonBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 | 
					bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 | 
				
			||||||
           const wxPoint& pos,
 | 
					           const wxPoint& pos,
 | 
				
			||||||
           const wxSize& size, long style,
 | 
					           const wxSize& size, long style,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,6 +24,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include "wx/mac/uma.h"
 | 
					#include "wx/mac/uma.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxCheckBoxBase::wxCheckBoxBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Single check box item
 | 
					// Single check box item
 | 
				
			||||||
bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 | 
					bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 | 
				
			||||||
           const wxPoint& pos,
 | 
					           const wxPoint& pos,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,6 +26,14 @@
 | 
				
			|||||||
#include "wx/mac/uma.h"
 | 
					#include "wx/mac/uma.h"
 | 
				
			||||||
#include "Appearance.h"
 | 
					#include "Appearance.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// ============================================================================
 | 
				
			||||||
 | 
					// implementation of wxCheckListBoxBase
 | 
				
			||||||
 | 
					// ============================================================================
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxCheckListBoxBase::wxCheckListBoxBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// ============================================================================
 | 
					// ============================================================================
 | 
				
			||||||
// implementation of wxCheckListBox
 | 
					// implementation of wxCheckListBox
 | 
				
			||||||
// ============================================================================
 | 
					// ============================================================================
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,6 +24,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include "wx/mac/uma.h"
 | 
					#include "wx/mac/uma.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxCheckBoxBase::wxCheckBoxBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Single check box item
 | 
					// Single check box item
 | 
				
			||||||
bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 | 
					bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 | 
				
			||||||
           const wxPoint& pos,
 | 
					           const wxPoint& pos,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,6 +26,14 @@
 | 
				
			|||||||
#include "wx/mac/uma.h"
 | 
					#include "wx/mac/uma.h"
 | 
				
			||||||
#include "Appearance.h"
 | 
					#include "Appearance.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// ============================================================================
 | 
				
			||||||
 | 
					// implementation of wxCheckListBoxBase
 | 
				
			||||||
 | 
					// ============================================================================
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxCheckListBoxBase::wxCheckListBoxBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// ============================================================================
 | 
					// ============================================================================
 | 
				
			||||||
// implementation of wxCheckListBox
 | 
					// implementation of wxCheckListBox
 | 
				
			||||||
// ============================================================================
 | 
					// ============================================================================
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -39,6 +39,16 @@ void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr);
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 | 
					IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBitmapButtonBase::wxBitmapButtonBase()
 | 
				
			||||||
 | 
					                                      : m_bmpNormal(), 
 | 
				
			||||||
 | 
					                                        m_bmpSelected(), 
 | 
				
			||||||
 | 
					                                        m_bmpFocus(), 
 | 
				
			||||||
 | 
					                                        m_bmpDisabled(), 
 | 
				
			||||||
 | 
					                                        m_marginX(0), 
 | 
				
			||||||
 | 
					                                        m_marginY(0)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wxBitmapButton::wxBitmapButton()
 | 
					wxBitmapButton::wxBitmapButton()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    m_marginX = m_marginY = wxDEFAULT_BUTTON_MARGIN;
 | 
					    m_marginX = m_marginY = wxDEFAULT_BUTTON_MARGIN;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -41,6 +41,10 @@ void wxCheckBoxCallback (Widget w, XtPointer clientData,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 | 
					IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxCheckBoxBase::wxCheckBoxBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Single check box item
 | 
					// Single check box item
 | 
				
			||||||
bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 | 
					bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 | 
				
			||||||
                        const wxPoint& pos,
 | 
					                        const wxPoint& pos,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,7 +23,15 @@
 | 
				
			|||||||
#include "wx/arrstr.h"
 | 
					#include "wx/arrstr.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// ============================================================================
 | 
					// ============================================================================
 | 
				
			||||||
// implementation
 | 
					// implementation of wxCheckListBoxBase
 | 
				
			||||||
 | 
					// ============================================================================
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxCheckListBoxBase::wxCheckListBoxBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// ============================================================================
 | 
				
			||||||
 | 
					// implementation of wxCheckListBox
 | 
				
			||||||
// ============================================================================
 | 
					// ============================================================================
 | 
				
			||||||
 | 
					
 | 
				
			||||||
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
 | 
					IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -362,6 +362,47 @@ wxBitmap::~wxBitmap()
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBitmap::wxBitmap()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Init();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBitmap::wxBitmap(const wxBitmap& bitmap)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Init();
 | 
				
			||||||
 | 
					    Ref(bitmap);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBitmap::wxBitmap(const char **data)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    CreateFromXpm(data);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBitmap::wxBitmap(char **data)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    CreateFromXpm((const char **)data);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if wxUSE_IMAGE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBitmap::wxBitmap(const wxImage& image, int depth)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    (void)CreateFromImage(image, depth);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBitmap::wxBitmap(const wxImage& image, const wxDC& dc)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    (void)CreateFromImage(image, dc);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // wxUSE_IMAGE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBitmap::wxBitmap(const wxIcon& icon)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Init();
 | 
				
			||||||
 | 
					    CopyFromIcon(icon);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
 | 
					wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    Init();
 | 
					    Init();
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -100,6 +100,16 @@ bitmap "disabled" ,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
 | 
					#define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBitmapButtonBase::wxBitmapButtonBase()
 | 
				
			||||||
 | 
					                                      : m_bmpNormal(), 
 | 
				
			||||||
 | 
					                                        m_bmpSelected(), 
 | 
				
			||||||
 | 
					                                        m_bmpFocus(), 
 | 
				
			||||||
 | 
					                                        m_bmpDisabled(), 
 | 
				
			||||||
 | 
					                                        m_marginX(0), 
 | 
				
			||||||
 | 
					                                        m_marginY(0)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
 | 
					bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
 | 
				
			||||||
           const wxPoint& pos,
 | 
					           const wxPoint& pos,
 | 
				
			||||||
           const wxSize& size, long style,
 | 
					           const wxSize& size, long style,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -119,6 +119,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 | 
				
			|||||||
// creation/destruction
 | 
					// creation/destruction
 | 
				
			||||||
// ----------------------------------------------------------------------------
 | 
					// ----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxButtonBase::wxButtonBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool wxButton::Create(wxWindow *parent,
 | 
					bool wxButton::Create(wxWindow *parent,
 | 
				
			||||||
                      wxWindowID id,
 | 
					                      wxWindowID id,
 | 
				
			||||||
                      const wxString& label,
 | 
					                      const wxString& label,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -112,6 +112,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 | 
				
			|||||||
// wxCheckBox
 | 
					// wxCheckBox
 | 
				
			||||||
// ----------------------------------------------------------------------------
 | 
					// ----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxCheckBoxBase::wxCheckBoxBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool wxCheckBox::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
 | 
					bool wxCheckBox::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId);
 | 
					    wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -64,7 +64,15 @@
 | 
				
			|||||||
#define GetItem(n)    ((wxCheckListBoxItem *)(GetItem(n)))
 | 
					#define GetItem(n)    ((wxCheckListBoxItem *)(GetItem(n)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// ============================================================================
 | 
					// ============================================================================
 | 
				
			||||||
// implementation
 | 
					// implementation of wxCheckListBoxBase
 | 
				
			||||||
 | 
					// ============================================================================
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxCheckListBoxBase::wxCheckListBoxBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// ============================================================================
 | 
				
			||||||
 | 
					// implementation of wxCheckListBox
 | 
				
			||||||
// ============================================================================
 | 
					// ============================================================================
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -106,6 +106,23 @@ IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 | 
				
			|||||||
// creation
 | 
					// creation
 | 
				
			||||||
// ----------------------------------------------------------------------------
 | 
					// ----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxChoice::wxChoice()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxChoice::wxChoice(wxWindow *parent,
 | 
				
			||||||
 | 
					                   wxWindowID id,
 | 
				
			||||||
 | 
					                   const wxPoint& pos,
 | 
				
			||||||
 | 
					                   const wxSize& size,
 | 
				
			||||||
 | 
					                   int n,
 | 
				
			||||||
 | 
					                   const wxString choices[],
 | 
				
			||||||
 | 
					                   long style,
 | 
				
			||||||
 | 
					                   const wxValidator& validator,
 | 
				
			||||||
 | 
					                   const wxString& name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Create(parent, id, pos, size, n, choices, style, validator, name);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool wxChoice::Create(wxWindow *parent,
 | 
					bool wxChoice::Create(wxWindow *parent,
 | 
				
			||||||
                      wxWindowID id,
 | 
					                      wxWindowID id,
 | 
				
			||||||
                      const wxPoint& pos,
 | 
					                      const wxPoint& pos,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -237,6 +237,24 @@ WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSE
 | 
				
			|||||||
// wxComboBox
 | 
					// wxComboBox
 | 
				
			||||||
// ----------------------------------------------------------------------------
 | 
					// ----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxComboBox::wxComboBox()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxComboBox::wxComboBox(wxWindow *parent, 
 | 
				
			||||||
 | 
					                       wxWindowID id,
 | 
				
			||||||
 | 
					                       const wxString& value,
 | 
				
			||||||
 | 
					                       const wxPoint& pos,
 | 
				
			||||||
 | 
					                       const wxSize& size,
 | 
				
			||||||
 | 
					                       int n,
 | 
				
			||||||
 | 
					                       const wxString choices[],
 | 
				
			||||||
 | 
					                       long style,
 | 
				
			||||||
 | 
					                       const wxValidator& validator,
 | 
				
			||||||
 | 
					                       const wxString& name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Create(parent, id, value, pos, size, n, choices, style, validator, name);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
 | 
					bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    switch ( msg )
 | 
					    switch ( msg )
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -33,6 +33,11 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
 | 
					IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxGDIObject::wxGDIObject()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    m_visible = FALSE;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
void wxGDIObject::IncrementResourceUsage(void)
 | 
					void wxGDIObject::IncrementResourceUsage(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -155,6 +155,19 @@ wxListBox::wxListBox()
 | 
				
			|||||||
    m_selected = 0;
 | 
					    m_selected = 0;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxListBox::wxListBox(wxWindow *parent,
 | 
				
			||||||
 | 
					                     wxWindowID id,
 | 
				
			||||||
 | 
					                     const wxPoint& pos,
 | 
				
			||||||
 | 
					                     const wxSize& size,
 | 
				
			||||||
 | 
					                     int n, 
 | 
				
			||||||
 | 
					                     const wxString choices[],
 | 
				
			||||||
 | 
					                     long style,
 | 
				
			||||||
 | 
					                     const wxValidator& validator,
 | 
				
			||||||
 | 
					                     const wxString& name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Create(parent, id, pos, size, n, choices, style, validator, name);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool wxListBox::Create(wxWindow *parent,
 | 
					bool wxListBox::Create(wxWindow *parent,
 | 
				
			||||||
                       wxWindowID id,
 | 
					                       wxWindowID id,
 | 
				
			||||||
                       const wxPoint& pos,
 | 
					                       const wxPoint& pos,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2778,5 +2778,20 @@ static void wxConvertToMSWListCol(int WXUNUSED(col), const wxListItem& item,
 | 
				
			|||||||
#endif // _WIN32_IE >= 0x0300
 | 
					#endif // _WIN32_IE >= 0x0300
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxListView::wxListView()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxListView::wxListView(wxWindow *parent,
 | 
				
			||||||
 | 
					                       wxWindowID winid,
 | 
				
			||||||
 | 
					                       const wxPoint& pos,
 | 
				
			||||||
 | 
					                       const wxSize& size,
 | 
				
			||||||
 | 
					                       long style,
 | 
				
			||||||
 | 
					                       const wxValidator& validator,
 | 
				
			||||||
 | 
					                       const wxString &name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Create(parent, winid, pos, size, style, validator, name);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif // wxUSE_LISTCTRL
 | 
					#endif // wxUSE_LISTCTRL
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -251,6 +251,22 @@ wxRadioBox::wxRadioBox()
 | 
				
			|||||||
    m_radioHeight = NULL;
 | 
					    m_radioHeight = NULL;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxRadioBox::wxRadioBox(wxWindow *parent,
 | 
				
			||||||
 | 
					                       wxWindowID id,
 | 
				
			||||||
 | 
					                       const wxString& title,
 | 
				
			||||||
 | 
					                       const wxPoint& pos,
 | 
				
			||||||
 | 
					                       const wxSize& size,
 | 
				
			||||||
 | 
					                       int n,
 | 
				
			||||||
 | 
					                       const wxString choices[],
 | 
				
			||||||
 | 
					                       int majorDim,
 | 
				
			||||||
 | 
					                       long style,
 | 
				
			||||||
 | 
					                       const wxValidator& val,
 | 
				
			||||||
 | 
					                       const wxString& name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    (void)Create(parent, id, title, pos, size, n, choices, majorDim,
 | 
				
			||||||
 | 
					                 style, val, name);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool wxRadioBox::Create(wxWindow *parent,
 | 
					bool wxRadioBox::Create(wxWindow *parent,
 | 
				
			||||||
                        wxWindowID id,
 | 
					                        wxWindowID id,
 | 
				
			||||||
                        const wxString& title,
 | 
					                        const wxString& title,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -102,6 +102,25 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 | 
				
			|||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxRadioButton::wxRadioButton()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Init();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxRadioButton::wxRadioButton(wxWindow *parent,
 | 
				
			||||||
 | 
					                             wxWindowID id,
 | 
				
			||||||
 | 
					                             const wxString& label,
 | 
				
			||||||
 | 
					                             const wxPoint& pos,
 | 
				
			||||||
 | 
					                             const wxSize& size,
 | 
				
			||||||
 | 
					                             long style,
 | 
				
			||||||
 | 
					                             const wxValidator& validator,
 | 
				
			||||||
 | 
					                             const wxString& name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Init();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Create(parent, id, label, pos, size, style, validator, name);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void wxRadioButton::Init()
 | 
					void wxRadioButton::Init()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    m_isChecked = false;
 | 
					    m_isChecked = false;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -134,6 +134,24 @@ END_EVENT_TABLE()
 | 
				
			|||||||
// wxTopLevelWindowMSW creation
 | 
					// wxTopLevelWindowMSW creation
 | 
				
			||||||
// ----------------------------------------------------------------------------
 | 
					// ----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxTopLevelWindowMSW::wxTopLevelWindowMSW()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Init();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxTopLevelWindowMSW::wxTopLevelWindowMSW(wxWindow *parent,
 | 
				
			||||||
 | 
					                                         wxWindowID id,
 | 
				
			||||||
 | 
					                                         const wxString& title,
 | 
				
			||||||
 | 
					                                         const wxPoint& pos,
 | 
				
			||||||
 | 
					                                         const wxSize& size,
 | 
				
			||||||
 | 
					                                         long style,
 | 
				
			||||||
 | 
					                                         const wxString& name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Init();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    (void)Create(parent, id, title, pos, size, style, name);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void wxTopLevelWindowMSW::Init()
 | 
					void wxTopLevelWindowMSW::Init()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    m_iconized =
 | 
					    m_iconized =
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -380,6 +380,22 @@ END_EVENT_TABLE()
 | 
				
			|||||||
// implementation
 | 
					// implementation
 | 
				
			||||||
// ===========================================================================
 | 
					// ===========================================================================
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxWindowMSW::wxWindowMSW()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Init();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxWindowMSW::wxWindowMSW(wxWindow *parent,
 | 
				
			||||||
 | 
					                         wxWindowID id,
 | 
				
			||||||
 | 
					                         const wxPoint& pos,
 | 
				
			||||||
 | 
					                         const wxSize& size,
 | 
				
			||||||
 | 
					                         long style,
 | 
				
			||||||
 | 
					                         const wxString& name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Init();
 | 
				
			||||||
 | 
					    Create(parent, id, pos, size, style, name);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// ---------------------------------------------------------------------------
 | 
					// ---------------------------------------------------------------------------
 | 
				
			||||||
// wxWindow utility functions
 | 
					// wxWindow utility functions
 | 
				
			||||||
// ---------------------------------------------------------------------------
 | 
					// ---------------------------------------------------------------------------
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -25,6 +25,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
 | 
					#define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBitmapButtonBase::wxBitmapButtonBase()
 | 
				
			||||||
 | 
					                                      : m_bmpNormal(), 
 | 
				
			||||||
 | 
					                                        m_bmpSelected(), 
 | 
				
			||||||
 | 
					                                        m_bmpFocus(), 
 | 
				
			||||||
 | 
					                                        m_bmpDisabled(), 
 | 
				
			||||||
 | 
					                                        m_marginX(0), 
 | 
				
			||||||
 | 
					                                        m_marginY(0)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool wxBitmapButton::Create(
 | 
					bool wxBitmapButton::Create(
 | 
				
			||||||
  wxWindow*                         pParent
 | 
					  wxWindow*                         pParent
 | 
				
			||||||
, wxWindowID                        vId
 | 
					, wxWindowID                        vId
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -41,6 +41,10 @@ extern void  wxAssociateWinWithHandle( HWND         hWnd
 | 
				
			|||||||
// wxCheckBox
 | 
					// wxCheckBox
 | 
				
			||||||
// ----------------------------------------------------------------------------
 | 
					// ----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxCheckBoxBase::wxCheckBoxBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool wxCheckBox::OS2Command(
 | 
					bool wxCheckBox::OS2Command(
 | 
				
			||||||
  WXUINT                            WXUNUSED(uParam)
 | 
					  WXUINT                            WXUNUSED(uParam)
 | 
				
			||||||
, WXWORD                            WXUNUSED(wId)
 | 
					, WXWORD                            WXUNUSED(wId)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -42,7 +42,15 @@
 | 
				
			|||||||
#define GetItem(n)    ((wxCheckListBoxItem *)(GetItem(n)))
 | 
					#define GetItem(n)    ((wxCheckListBoxItem *)(GetItem(n)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// ============================================================================
 | 
					// ============================================================================
 | 
				
			||||||
// implementation
 | 
					// implementation of wxCheckListBoxBase
 | 
				
			||||||
 | 
					// ============================================================================
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxCheckListBoxBase::wxCheckListBoxBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// ============================================================================
 | 
				
			||||||
 | 
					// implementation of wxCheckListBox
 | 
				
			||||||
// ============================================================================
 | 
					// ============================================================================
 | 
				
			||||||
 | 
					
 | 
				
			||||||
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
 | 
					IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2896,4 +2896,19 @@ MRESULT wxListCtrl::OS2WindowProc(
 | 
				
			|||||||
    return lRc;
 | 
					    return lRc;
 | 
				
			||||||
} // end of wxListCtrl::WindowProc
 | 
					} // end of wxListCtrl::WindowProc
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxListView::wxListView()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxListView::wxListView(wxWindow *parent,
 | 
				
			||||||
 | 
					                       wxWindowID winid,
 | 
				
			||||||
 | 
					                       const wxPoint& pos,
 | 
				
			||||||
 | 
					                       const wxSize& size,
 | 
				
			||||||
 | 
					                       long style,
 | 
				
			||||||
 | 
					                       const wxValidator& validator,
 | 
				
			||||||
 | 
					                       const wxString &name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Create(parent, winid, pos, size, style, validator, name);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif // wxUSE_LISTCTRL
 | 
					#endif // wxUSE_LISTCTRL
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -52,6 +52,32 @@ END_EVENT_TABLE()
 | 
				
			|||||||
// wxBitmapButton
 | 
					// wxBitmapButton
 | 
				
			||||||
// ----------------------------------------------------------------------------
 | 
					// ----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBitmapButtonBase::wxBitmapButtonBase()
 | 
				
			||||||
 | 
					                                      : m_bmpNormal(), 
 | 
				
			||||||
 | 
					                                        m_bmpSelected(), 
 | 
				
			||||||
 | 
					                                        m_bmpFocus(), 
 | 
				
			||||||
 | 
					                                        m_bmpDisabled(), 
 | 
				
			||||||
 | 
					                                        m_marginX(0), 
 | 
				
			||||||
 | 
					                                        m_marginY(0)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBitmapButton::wxBitmapButton()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxBitmapButton::wxBitmapButton(wxWindow *parent,
 | 
				
			||||||
 | 
					                               wxWindowID id,
 | 
				
			||||||
 | 
					                               const wxBitmap& bitmap,
 | 
				
			||||||
 | 
					                               const wxPoint& pos,
 | 
				
			||||||
 | 
					                               const wxSize& size,
 | 
				
			||||||
 | 
					                               long style,
 | 
				
			||||||
 | 
					                               const wxValidator& validator,
 | 
				
			||||||
 | 
					                               const wxString& name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Create(parent, id, bitmap, pos, size, style, validator, name);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool wxBitmapButton::Create(wxWindow *parent,
 | 
					bool wxBitmapButton::Create(wxWindow *parent,
 | 
				
			||||||
                            wxWindowID id,
 | 
					                            wxWindowID id,
 | 
				
			||||||
                            const wxBitmap& bitmap,
 | 
					                            const wxBitmap& bitmap,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -60,6 +60,44 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 | 
				
			|||||||
// creation
 | 
					// creation
 | 
				
			||||||
// ----------------------------------------------------------------------------
 | 
					// ----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxButtonBase::wxButtonBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxButton::wxButton()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Init();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxButton::wxButton(wxWindow *parent,
 | 
				
			||||||
 | 
					                   wxWindowID id,
 | 
				
			||||||
 | 
					                   const wxBitmap& bitmap,
 | 
				
			||||||
 | 
					                   const wxString& label,
 | 
				
			||||||
 | 
					                   const wxPoint& pos,
 | 
				
			||||||
 | 
					                   const wxSize& size,
 | 
				
			||||||
 | 
					                   long style,
 | 
				
			||||||
 | 
					                   const wxValidator& validator,
 | 
				
			||||||
 | 
					                   const wxString& name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Init();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Create(parent, id, bitmap, label, pos, size, style, validator, name);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxButton::wxButton(wxWindow *parent,
 | 
				
			||||||
 | 
					                   wxWindowID id,
 | 
				
			||||||
 | 
					                   const wxString& label,
 | 
				
			||||||
 | 
					                   const wxPoint& pos,
 | 
				
			||||||
 | 
					                   const wxSize& size,
 | 
				
			||||||
 | 
					                   long style,
 | 
				
			||||||
 | 
					                   const wxValidator& validator,
 | 
				
			||||||
 | 
					                   const wxString& name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Init();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Create(parent, id, label, pos, size, style, validator, name);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void wxButton::Init()
 | 
					void wxButton::Init()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    m_isPressed =
 | 
					    m_isPressed =
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -52,6 +52,29 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 | 
				
			|||||||
// wxCheckBox
 | 
					// wxCheckBox
 | 
				
			||||||
// ----------------------------------------------------------------------------
 | 
					// ----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxCheckBoxBase::wxCheckBoxBase()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxCheckBox::wxCheckBox()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Init();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					wxCheckBox::wxCheckBox(wxWindow *parent,
 | 
				
			||||||
 | 
					                       wxWindowID id,
 | 
				
			||||||
 | 
					                       const wxString& label,
 | 
				
			||||||
 | 
					                       const wxPoint& pos,
 | 
				
			||||||
 | 
					                       const wxSize& size,
 | 
				
			||||||
 | 
					                       long style,
 | 
				
			||||||
 | 
					                       const wxValidator& validator,
 | 
				
			||||||
 | 
					                       const wxString& name)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Init();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Create(parent, id, label, pos, size, style, validator, name);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void wxCheckBox::Init()
 | 
					void wxCheckBox::Init()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    m_isPressed = FALSE;
 | 
					    m_isPressed = FALSE;
 | 
				
			||||||
 
 | 
				
			|||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user