- added focus event forwarding to wxGrid (Peter Laufenberg)
- fixed scrollbar problem in wxGrid (not showing scrollbars
when sizing smaller) (Shane Harper)
+- dbbrowse demo fixed for Unicode (Wlodzimierz Skiba)
wxMSW:
new revision: 1.72; previous revision: 1.71
done
+34. Apply patch [ 851052 ] [msw] Clipboard: Allow automatic format conversionsChecking in clipbrd.cpp;
+/pack/cvsroots/wxwindows/wxWindows/src/msw/clipbrd.cpp,v <-- clipbrd.cpp
+new revision: 1.54; previous revision: 1.53
+done
+
TODO for 2.4 (items that are not backports)
===========================================
class WXDLLEXPORT wxBitmapButtonBase : public wxButton
{
public:
- wxBitmapButtonBase();
+ wxBitmapButtonBase()
+ : m_bmpNormal(), m_bmpSelected(), m_bmpFocus(), m_bmpDisabled()
+ , m_marginX(0), m_marginY(0)
+ { }
// set the bitmaps
void SetBitmapLabel(const wxBitmap& bitmap)
// construction
// ------------
- wxBookCtrl();
+ wxBookCtrl()
+ {
+ Init();
+ }
wxBookCtrl(wxWindow *parent,
wxWindowID winid,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
- const wxString& name = wxEmptyString);
+ const wxString& name = wxEmptyString)
+ {
+ Init();
+
+ (void)Create(parent, winid, pos, size, style, name);
+ }
// quasi ctor
bool Create(wxWindow *parent,
class WXDLLEXPORT wxButtonBase : public wxControl
{
public:
- wxButtonBase();
+ wxButtonBase() { }
// show the image in the button in addition to the label
virtual void SetImageLabel(const wxBitmap& WXUNUSED(bitmap)) { }
class WXDLLEXPORT wxCheckBoxBase : public wxControl
{
public:
- wxCheckBoxBase();
+ wxCheckBoxBase() { }
// set/get the checked status of the listbox
virtual void SetValue(bool value) = 0;
class WXDLLEXPORT wxCheckListBoxBase : public wxListBox
{
public:
- wxCheckListBoxBase();
+ wxCheckListBoxBase() { }
// check list box specific methods
virtual bool IsChecked(size_t item) const = 0;
class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
{
public:
- wxChoiceBase();
+ wxChoiceBase() { }
virtual ~wxChoiceBase();
// all generic methods are in wxControlWithItems
class WXDLLEXPORT wxControlBase : public wxWindow
{
public:
- wxControlBase();
+ wxControlBase() { }
virtual ~wxControlBase();
class WXDLLEXPORT wxItemContainer
{
public:
- wxItemContainer();
+ wxItemContainer() { m_clientDataItemsType = wxClientData_None; }
virtual ~wxItemContainer();
// adding items
class WXDLLEXPORT wxControlWithItems : public wxControl, public wxItemContainer
{
public:
- wxControlWithItems();
+ wxControlWithItems() { }
virtual ~wxControlWithItems();
// we have to redefine these functions here to avoid ambiguities in classes
class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
{
public:
- wxDialogBase();
+ wxDialogBase() { Init(); }
virtual ~wxDialogBase() { }
void Init();
class WXDLLEXPORT wxFileDialogBase: public wxDialog
{
public:
- wxFileDialogBase ();
+ wxFileDialogBase () {}
wxFileDialogBase(wxWindow *parent,
const wxString& message = wxFileSelectorPromptStr,
class WXDLLEXPORT wxAnyChoiceDialog : public wxDialog
{
public:
- wxAnyChoiceDialog();
+ wxAnyChoiceDialog() { }
wxAnyChoiceDialog(wxWindow *parent,
const wxString& message,
int n, const wxString *choices,
long styleDlg = wxCHOICEDLG_STYLE,
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,
const wxString& message,
class WXDLLEXPORT wxSingleChoiceDialog : public wxAnyChoiceDialog
{
public:
- wxSingleChoiceDialog();
+ wxSingleChoiceDialog()
+ {
+ m_selection = -1;
+ }
wxSingleChoiceDialog(wxWindow *parent,
const wxString& message,
class WXDLLEXPORT wxMultiChoiceDialog : public wxAnyChoiceDialog
{
public:
- wxMultiChoiceDialog();
+ wxMultiChoiceDialog() { }
wxMultiChoiceDialog(wxWindow *parent,
const wxString& message,
int n,
const wxString *choices,
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,
const wxString& message,
class WXDLLEXPORT wxGenericFileDialog: public wxFileDialogBase
{
public:
- wxGenericFileDialog();
+ wxGenericFileDialog() { }
wxGenericFileDialog(wxWindow *parent,
const wxString& message = wxFileSelectorPromptStr,
DECLARE_DYNAMIC_CLASS(wxFileDialog)
public:
- wxFileDialog();
+ wxFileDialog() {}
wxFileDialog(wxWindow *parent,
const wxString& message = wxFileSelectorPromptStr,
const wxString& defaultFile = _T(""),
const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
long style = 0,
- const wxPoint& pos = wxDefaultPosition);
+ const wxPoint& pos = wxDefaultPosition)
+ :wxGenericFileDialog(parent, message, defaultDir, defaultFile, wildCard, style, pos)
+ {
+ }
};
#endif // USE_GENERIC_FILEDIALOG
const wxSize &size = wxDefaultSize,
long style = wxLC_ICON,
const wxValidator& validator = wxDefaultValidator,
- const wxString &name = wxT("listctrl") );
+ const wxString &name = wxT("listctrl") )
+ {
+ Create(parent, winid, pos, size, style, validator, name);
+ }
~wxGenericListCtrl();
bool Create( wxWindow *parent,
DECLARE_DYNAMIC_CLASS(wxListCtrl)
public:
- wxListCtrl();
+ wxListCtrl() {}
wxListCtrl(wxWindow *parent, wxWindowID winid = -1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxLC_ICON,
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__
class WXDLLEXPORT wxMDIParentFrame: public wxGenericMDIParentFrame
{
public:
- wxMDIParentFrame();
+ wxMDIParentFrame() {}
wxMDIParentFrame(wxWindow *parent,
wxWindowID winid,
const wxString& title,
class WXDLLEXPORT wxMDIChildFrame: public wxGenericMDIChildFrame
{
public:
- wxMDIChildFrame();
+ wxMDIChildFrame() {}
+
wxMDIChildFrame( wxGenericMDIParentFrame *parent,
wxWindowID winid,
const wxString& title,
class WXDLLEXPORT wxMDIClientWindow: public wxGenericMDIClientWindow
{
public:
- wxMDIClientWindow();
- wxMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 );
+ wxMDIClientWindow() {}
+
+ wxMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 )
+ :wxGenericMDIClientWindow(parent, style)
+ {
+ }
private:
DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
public wxScrollHelper
{
public:
- wxGenericScrolledWindow();
+ wxGenericScrolledWindow() : wxScrollHelper(this) { }
wxGenericScrolledWindow(wxWindow *parent,
wxWindowID winid = -1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxScrolledWindowStyle,
- const wxString& name = wxPanelNameStr);
+ const wxString& name = wxPanelNameStr)
+ : wxScrollHelper(this)
+ {
+ Create(parent, winid, pos, size, style, name);
+ }
virtual ~wxGenericScrolledWindow();
class WXDLLEXPORT wxListBoxBase : public wxControlWithItems
{
public:
- wxListBoxBase();
+ wxListBoxBase() { }
virtual ~wxListBoxBase();
// all generic methods are in wxControlWithItems, except for the following
class WXDLLEXPORT wxListView : public wxListCtrl
{
public:
- wxListView();
+ wxListView() { }
wxListView( wxWindow *parent,
wxWindowID winid = -1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxLC_REPORT,
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
// ---------------------
{
public:
// default ctor creates an invalid bitmap, you must Create() it later
- wxBitmap();
+ wxBitmap() { Init(); }
// Copy constructors
- wxBitmap(const wxBitmap& bitmap);
+ wxBitmap(const wxBitmap& bitmap) { Init(); Ref(bitmap); }
// Initialize with raw data
wxBitmap(const char bits[], int width, int height, int depth = 1);
// Initialize with XPM data
- wxBitmap(const char **data);
- wxBitmap(char **data);
+ wxBitmap(const char **data) { CreateFromXpm(data); }
+ wxBitmap(char **data) { CreateFromXpm((const char **)data); }
// Load a file or resource
wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE);
wxBitmap(int width, int height, const wxDC& dc);
#if wxUSE_IMAGE
-
// 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
- wxBitmap(const wxImage& image, const wxDC& dc);
-
+ wxBitmap(const wxImage& image, const wxDC& dc)
+ { (void)CreateFromImage(image, dc); }
#endif // wxUSE_IMAGE
// we must have this, otherwise icons are silently copied into bitmaps using
// the copy ctor but the resulting bitmap is invalid!
- wxBitmap(const wxIcon& icon);
+ wxBitmap(const wxIcon& icon) { Init(); CopyFromIcon(icon); }
wxBitmap& operator=(const wxBitmap& bitmap)
{
{
public:
// ctors
- wxChoice();
+ wxChoice() { }
virtual ~wxChoice();
wxChoice(wxWindow *parent,
int n = 0, const wxString choices[] = NULL,
long style = 0,
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,
class WXDLLEXPORT wxComboBox: public wxChoice
{
public:
- wxComboBox();
+ wxComboBox() { }
wxComboBox(wxWindow *parent, wxWindowID id,
const wxString& value = wxEmptyString,
int n = 0, const wxString choices[] = NULL,
long style = 0,
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,
wxWindowID id,
class WXDLLEXPORT wxGDIObject : public wxObject
{
public:
- wxGDIObject();
+ wxGDIObject() { m_visible = FALSE; };
// Creates the resource
virtual bool RealizeResource() { return FALSE; };
int n = 0, const wxString choices[] = NULL,
long style = 0,
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,
const wxPoint& pos = wxDefaultPosition,
int majorDim = 0,
long style = wxRA_HORIZONTAL,
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();
{
public:
// ctors and creation functions
- wxRadioButton();
+ wxRadioButton() { Init(); }
wxRadioButton(wxWindow *parent,
wxWindowID id,
const wxSize& size = wxDefaultSize,
long style = 0,
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,
wxWindowID id,
{
public:
// constructors and such
- wxTopLevelWindowMSW();
+ wxTopLevelWindowMSW() { Init(); }
wxTopLevelWindowMSW(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
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,
wxWindowID id,
class WXDLLEXPORT wxWindowMSW : public wxWindowBase
{
public:
- wxWindowMSW();
+ wxWindowMSW() { Init(); }
wxWindowMSW(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
- const wxString& name = wxPanelNameStr);
+ const wxString& name = wxPanelNameStr)
+ {
+ Init();
+ Create(parent, id, pos, size, style, name);
+ }
virtual ~wxWindowMSW();
// ctors
// -----
- wxNotebookBase();
+ wxNotebookBase() { }
wxNotebookBase(wxWindow *parent,
wxWindowID winid,
class WXDLLEXPORT wxScrolledWindow : public wxGenericScrolledWindow
{
public:
- wxScrolledWindow();
+ wxScrolledWindow() { }
wxScrolledWindow(wxWindow *parent,
wxWindowID winid = -1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxScrolledWindowStyle,
- const wxString& name = wxPanelNameStr);
+ const wxString& name = wxPanelNameStr)
+ : wxGenericScrolledWindow(parent, winid, pos, size, style, name)
+ {
+ }
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxScrolledWindow)
class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase
{
public:
- wxBitmapButton();
+ wxBitmapButton() { }
wxBitmapButton(wxWindow *parent,
wxWindowID id,
const wxSize& size = wxDefaultSize,
long style = 0,
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,
wxWindowID id,
class WXDLLEXPORT wxButton : public wxButtonBase
{
public:
- wxButton();
+ wxButton() { Init(); }
wxButton(wxWindow *parent,
wxWindowID id,
const wxBitmap& bitmap,
const wxSize& size = wxDefaultSize,
long style = 0,
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,
wxWindowID id,
const wxSize& size = wxDefaultSize,
long style = 0,
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,
wxWindowID id,
};
// constructors
- wxCheckBox();
+ wxCheckBox() { Init(); }
wxCheckBox(wxWindow *parent,
wxWindowID id,
const wxSize& size = wxDefaultSize,
long style = 0,
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,
wxWindowID id,
{
public:
// ctors
- wxCheckListBox();
+ wxCheckListBox() { Init(); }
wxCheckListBox(wxWindow *parent,
wxWindowID id,
const wxString *choices = NULL,
long style = 0,
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,
wxWindowID id,
class WXDLLEXPORT wxChoice : public wxComboBox
{
public:
- wxChoice();
+ wxChoice() {}
wxChoice(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = (const wxString *) NULL,
long style = 0,
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,
const wxPoint& pos = wxDefaultPosition,
{
public:
// construction
- wxComboControl();
+ wxComboControl()
+ {
+ Init();
+ }
wxComboControl(wxWindow *parent,
wxWindowID id,
const wxSize& size = wxDefaultSize,
long style = 0,
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,
wxWindowID id,
{
public:
// ctors and such
- wxComboBox();
+ wxComboBox() { Init(); }
wxComboBox(wxWindow *parent,
wxWindowID id,
const wxString *choices = (const wxString *) NULL,
long style = 0,
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,
wxWindowID id,
class WXDLLEXPORT wxControl : public wxControlBase, public wxInputConsumer
{
public:
- wxControl();
+ wxControl() { Init(); }
wxControl(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
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,
wxWindowID id,
class WXDLLEXPORT wxDialog : public wxDialogBase
{
public:
- wxDialog();
+ wxDialog() { Init(); }
// Constructor with no modal flag - the new convention.
wxDialog(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
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,
const wxString& title,
class WXDLLEXPORT wxFrame : public wxFrameBase
{
public:
- wxFrame();
+ wxFrame() {}
wxFrame(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
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,
wxWindowID id,
class WXDLLEXPORT wxInputConsumer
{
public:
- wxInputConsumer();
+ wxInputConsumer() { m_inputHandler = NULL; }
// get the input handler
wxInputHandler *GetInputHandler() const { return m_inputHandler; }
{
public:
// ctors and such
- wxListBox();
+ wxListBox() { Init(); }
wxListBox(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
int n = 0, const wxString choices[] = (const wxString *) NULL,
long style = 0,
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();
// ctors and such
// --------------
- wxNotebook();
+ wxNotebook() { Init(); }
wxNotebook(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
- const wxString& name = wxNOTEBOOK_NAME);
+ const wxString& name = wxNOTEBOOK_NAME)
+ {
+ Init();
+
+ (void)Create(parent, id, pos, size, style, name);
+ }
// quasi ctor
bool Create(wxWindow *parent,
{
public:
// wxRadioBox construction
- wxRadioBox();
+ wxRadioBox() { Init(); }
wxRadioBox(wxWindow *parent,
wxWindowID id,
int majorDim = 0,
long style = wxRA_SPECIFY_COLS,
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,
wxWindowID id,
{
public:
// constructors
- wxRadioButton();
+ wxRadioButton() { Init(); }
wxRadioButton(wxWindow *parent,
wxWindowID id,
const wxSize& size = wxDefaultSize,
long style = 0,
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,
wxWindowID id,
// creation
// --------
- wxTextCtrl();
+ wxTextCtrl() { Init(); }
wxTextCtrl(wxWindow *parent,
wxWindowID id,
const wxSize& size = wxDefaultSize,
long style = 0,
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,
wxWindowID id,
{
public:
// construction/destruction
- wxToolBar();
+ wxToolBar() { Init(); }
wxToolBar(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
- const wxString& name = wxToolBarNameStr);
+ const wxString& name = wxToolBarNameStr)
+ {
+ Init();
+
+ Create(parent, id, pos, size, style, name);
+ }
bool Create( wxWindow *parent,
wxWindowID id,
{
public:
// construction
- wxTopLevelWindow();
+ wxTopLevelWindow() { Init(); }
wxTopLevelWindow(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
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,
wxWindowID id,
// ctors and create functions
// ---------------------------
- wxWindow();
+ wxWindow() { Init(); }
wxWindow(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
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,
wxWindowID id,
// default ctor, initializes everything which can be initialized before
// Create()
- wxWindowBase();
+ wxWindowBase() ;
// pseudo ctor (can't be virtual, called from ctor)
bool CreateBase(wxWindowBase *parent,
END_EVENT_TABLE()
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,
const wxBitmap& bitmap, const wxPoint& pos,
const wxSize& size, long style,
#import <AppKit/NSButton.h>
#include "wx/cocoa/string.h"
-wxButtonBase::wxButtonBase()
-{
-}
-
IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
BEGIN_EVENT_TABLE(wxButton, wxButtonBase)
END_EVENT_TABLE()
// 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()
{
m_imageList = NULL;
// implementation
// ============================================================================
-wxChoiceBase::wxChoiceBase()
-{
-}
-
wxChoiceBase::~wxChoiceBase()
{
// this destructor is required for Darwin
// implementation
// ============================================================================
-wxControlBase::wxControlBase()
-{
-}
-
wxControlBase::~wxControlBase()
{
// this destructor is required for Darwin
// implementation
// ============================================================================
-wxItemContainer::wxItemContainer()
-{
- m_clientDataItemsType = wxClientData_None;
-}
-
wxItemContainer::~wxItemContainer()
{
// this destructor is required for Darwin
return DoGetItemClientData(n);
}
-wxControlWithItems::wxControlWithItems()
-{
-}
-
wxControlWithItems::~wxControlWithItems()
{
// this destructor is required for Darwin
WX_DELEGATE_TO_CONTROL_CONTAINER(wxDialogBase)
#endif
-wxDialogBase::wxDialogBase()
-{
- Init();
-}
-
void wxDialogBase::Init()
{
m_returnCode = 0;
IMPLEMENT_DYNAMIC_CLASS(wxFileDialogBase, wxDialog)
-wxFileDialogBase::wxFileDialogBase ()
-{
-}
-
wxFileDialogBase::wxFileDialogBase(wxWindow *parent,
const wxString& message,
const wxString& defaultDir,
// implementation
// ============================================================================
-wxListBoxBase::wxListBoxBase()
-{
-}
-
wxListBoxBase::~wxListBoxBase()
{
// this destructor is required for Darwin
// 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
// ----------------------------------------------------------------------------
// 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,
const wxString& message,
const wxString& caption,
IMPLEMENT_DYNAMIC_CLASS(wxSingleChoiceDialog, wxDialog)
-wxSingleChoiceDialog::wxSingleChoiceDialog()
-{
- m_selection = -1;
-}
-
wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
const wxString& message,
const wxString& caption,
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,
const wxString& message,
const wxString& caption,
int wxGenericDirCtrl::ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions)
{
-#if wxUSE_FILEDLG
return wxFileDialogBase::ParseWildcard(filterStr, descriptions, filters );
-#else
- return 0;
-#endif
}
void wxGenericDirCtrl::DoResize()
long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST;
bool wxGenericFileDialog::ms_lastShowHidden = FALSE;
-wxGenericFileDialog::wxGenericFileDialog()
-{
-}
-
wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
const wxString& message,
const wxString& defaultDir,
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 // wxUSE_FILEDLG
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()
{
if (m_ownsImageListNormal)
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
#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
{
wxGenericMDIChildFrame *pGFrame = wxGenericMDIParentFrame::GetActiveChild();
// and the standard print dialog. The global printing 'mode'
// is determined by whether the user checks Print to file
// or not.
-#if wxUSE_FILEDLG
if (m_printDialogData.GetPrintToFile())
{
m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_FILE);
m_printDialogData.GetPrintData().SetFilename( dialog.GetPath() );
}
else
-#endif
{
m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER);
}
EVT_PAINT(wxGenericScrolledWindow::OnPaint)
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,
wxWindowID id,
const wxPoint& pos,
#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
// vi:sts=4:sw=4:et
IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
-wxBitmapButtonBase::wxBitmapButtonBase()
- : m_bmpNormal(),
- m_bmpSelected(),
- m_bmpFocus(),
- m_bmpDisabled(),
- m_marginX(0),
- m_marginY(0)
-{
-}
-
void wxBitmapButton::Init()
{
m_hasFocus =
// wxCheckBox
//-----------------------------------------------------------------------------
-wxCheckBoxBase::wxCheckBoxBase()
-{
-}
-
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
wxCheckBox::wxCheckBox()
#include <gdk/gdk.h>
#include <gtk/gtk.h>
-//-----------------------------------------------------------------------------
-// wxCheckListBoxBase
-//-----------------------------------------------------------------------------
-
-wxCheckListBoxBase::wxCheckListBoxBase()
-{
-}
-
//-----------------------------------------------------------------------------
// wxCheckListBox
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
-wxBitmapButtonBase::wxBitmapButtonBase()
- : m_bmpNormal(),
- m_bmpSelected(),
- m_bmpFocus(),
- m_bmpDisabled(),
- m_marginX(0),
- m_marginY(0)
-{
-}
-
void wxBitmapButton::Init()
{
m_hasFocus =
// wxCheckBox
//-----------------------------------------------------------------------------
-wxCheckBoxBase::wxCheckBoxBase()
-{
-}
-
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
wxCheckBox::wxCheckBox()
#include <gdk/gdk.h>
#include <gtk/gtk.h>
-//-----------------------------------------------------------------------------
-// wxCheckListBoxBase
-//-----------------------------------------------------------------------------
-
-wxCheckListBoxBase::wxCheckListBoxBase()
-{
-}
-
//-----------------------------------------------------------------------------
// wxCheckListBox
//-----------------------------------------------------------------------------
#include "wx/mac/uma.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,
const wxPoint& pos,
const wxSize& size, long style,
static const int kMacOSXHorizontalBorder = 2 ;
static const int kMacOSXVerticalBorder = 4 ;
-wxButtonBase::wxButtonBase()
-{
-}
-
bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos,
const wxSize& size, long style,
#include "wx/mac/uma.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,
const wxPoint& pos,
const wxSize& size, long style,
static const int kMacOSXHorizontalBorder = 2 ;
static const int kMacOSXVerticalBorder = 4 ;
-wxButtonBase::wxButtonBase()
-{
-}
-
bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos,
const wxSize& size, long style,
#include "wx/mac/uma.h"
-wxCheckBoxBase::wxCheckBoxBase()
-{
-}
-
// Single check box item
bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos,
#include "wx/mac/uma.h"
#include "Appearance.h"
-// ============================================================================
-// implementation of wxCheckListBoxBase
-// ============================================================================
-
-wxCheckListBoxBase::wxCheckListBoxBase()
-{
-}
-
// ============================================================================
// implementation of wxCheckListBox
// ============================================================================
#include "wx/mac/uma.h"
-wxCheckBoxBase::wxCheckBoxBase()
-{
-}
-
// Single check box item
bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos,
#include "wx/mac/uma.h"
#include "Appearance.h"
-// ============================================================================
-// implementation of wxCheckListBoxBase
-// ============================================================================
-
-wxCheckListBoxBase::wxCheckListBoxBase()
-{
-}
-
// ============================================================================
// implementation of wxCheckListBox
// ============================================================================
IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
-wxBitmapButtonBase::wxBitmapButtonBase()
- : m_bmpNormal(),
- m_bmpSelected(),
- m_bmpFocus(),
- m_bmpDisabled(),
- m_marginX(0),
- m_marginY(0)
-{
-}
-
wxBitmapButton::wxBitmapButton()
{
m_marginX = m_marginY = wxDEFAULT_BUTTON_MARGIN;
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
-wxCheckBoxBase::wxCheckBoxBase()
-{
-}
-
// Single check box item
bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos,
#include "wx/arrstr.h"
// ============================================================================
-// implementation of wxCheckListBoxBase
-// ============================================================================
-
-wxCheckListBoxBase::wxCheckListBoxBase()
-{
-}
-
-// ============================================================================
-// implementation of wxCheckListBox
+// implementation
// ============================================================================
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
{
}
-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)
{
Init();
#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,
const wxPoint& pos,
const wxSize& size, long style,
// creation/destruction
// ----------------------------------------------------------------------------
-wxButtonBase::wxButtonBase()
-{
-}
-
bool wxButton::Create(wxWindow *parent,
wxWindowID id,
const wxString& label,
// wxCheckBox
// ----------------------------------------------------------------------------
-wxCheckBoxBase::wxCheckBoxBase()
-{
-}
-
bool wxCheckBox::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
{
wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId);
#define GetItem(n) ((wxCheckListBoxItem *)(GetItem(n)))
// ============================================================================
-// implementation of wxCheckListBoxBase
-// ============================================================================
-
-wxCheckListBoxBase::wxCheckListBoxBase()
-{
-}
-
-// ============================================================================
-// implementation of wxCheckListBox
+// implementation
// ============================================================================
// 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,
wxWindowID id,
const wxPoint& pos,
// 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)
{
switch ( msg )
IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
-wxGDIObject::wxGDIObject()
-{
- m_visible = FALSE;
-}
-
/*
void wxGDIObject::IncrementResourceUsage(void)
{
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,
wxWindowID id,
const wxPoint& pos,
#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
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,
wxWindowID id,
const wxString& title,
#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()
{
m_isChecked = false;
// 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()
{
m_iconized =
// 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
// ---------------------------------------------------------------------------
#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* pParent
, wxWindowID vId
// wxCheckBox
// ----------------------------------------------------------------------------
-wxCheckBoxBase::wxCheckBoxBase()
-{
-}
-
bool wxCheckBox::OS2Command(
WXUINT WXUNUSED(uParam)
, WXWORD WXUNUSED(wId)
#define GetItem(n) ((wxCheckListBoxItem *)(GetItem(n)))
// ============================================================================
-// implementation of wxCheckListBoxBase
-// ============================================================================
-
-wxCheckListBoxBase::wxCheckListBoxBase()
-{
-}
-
-// ============================================================================
-// implementation of wxCheckListBox
+// implementation
// ============================================================================
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
return lRc;
} // 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
// 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,
wxWindowID id,
const wxBitmap& bitmap,
// 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()
{
m_isPressed =
// 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()
{
m_isPressed = FALSE;
#include "wx/univ/inphand.h"
#include "wx/univ/theme.h"
-// ============================================================================
-// implementation of wxCheckListBoxBase
-// ============================================================================
-
-wxCheckListBoxBase::wxCheckListBoxBase()
-{
-}
-
// ============================================================================
// implementation of wxCheckListBox
// ============================================================================
// creation
// ----------------------------------------------------------------------------
-wxCheckListBox::wxCheckListBox()
-{
- Init();
-}
-
-wxCheckListBox::wxCheckListBox(wxWindow *parent,
- wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- int nStrings,
- const wxString *choices,
- long style,
- const wxValidator& validator,
- const wxString& name)
-{
- Init();
-
- Create(parent, id, pos, size, nStrings, choices, style, validator, name);
-}
-
void wxCheckListBox::Init()
{
}
EVT_COMBOBOX(-1, wxChoice::OnComboBox)
END_EVENT_TABLE()
-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, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
// wxComboControl creation
// ----------------------------------------------------------------------------
-wxComboControl::wxComboControl()
-{
- Init();
-}
-
-wxComboControl::wxComboControl(wxWindow *parent,
- wxWindowID id,
- const wxString& value,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxValidator& validator,
- const wxString& name)
-{
- Init();
-
- (void)Create(parent, id, value, pos, size, style, validator, name);
-}
-
void wxComboControl::Init()
{
m_popup = (wxComboPopup *)NULL;
// wxComboBox
// ----------------------------------------------------------------------------
-wxComboBox::wxComboBox()
-{
- Init();
-}
-
-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)
-{
- Init();
-
- (void)Create(parent, id, value, pos, size, n, choices,
- style, validator, name);
-}
-
void wxComboBox::Init()
{
m_lbox = (wxListBox *)NULL;
// creation
// ----------------------------------------------------------------------------
-wxControl::wxControl()
-{
- Init();
-}
-
-wxControl::wxControl(wxWindow *parent,
- wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxValidator& validator,
- const wxString& name)
-{
- Init();
-
- Create(parent, id, pos, size, style, validator, name);
-}
-
void wxControl::Init()
{
m_indexAccel = -1;
IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
-wxDialog::wxDialog()
-{
- Init();
-}
-
-wxDialog::wxDialog(wxWindow *parent,
- wxWindowID id,
- const wxString& title,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
-{
- Init();
- Create(parent, id, title, pos, size, style, name);
-}
-
void wxDialog::Init()
{
m_returnCode = 0;
// ctors
// ----------------------------------------------------------------------------
-wxFrame::wxFrame()
-{
-}
-
-wxFrame::wxFrame(wxWindow *parent,
- wxWindowID id,
- const wxString& title,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
-{
- Create(parent, id, title, pos, size, style, name);
-}
-
bool wxFrame::Create(wxWindow *parent,
wxWindowID id,
const wxString& title,
// implementation
// ============================================================================
-wxInputConsumer::wxInputConsumer()
-{
- m_inputHandler = NULL;
-}
-
// ----------------------------------------------------------------------------
// focus/activation handling
// ----------------------------------------------------------------------------
// construction
// ----------------------------------------------------------------------------
-wxListBox::wxListBox()
-{
- Init();
-}
-
-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)
-{
- Init();
-
- Create(parent, id, pos, size, n, choices, style, validator, name);
-}
-
void wxListBox::Init()
{
// will be calculated later when needed
// wxNotebook creation
// ----------------------------------------------------------------------------
-wxNotebook::wxNotebook()
-{
- Init();
-}
-
-wxNotebook::wxNotebook(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 wxNotebook::Init()
{
m_sel = INVALID_PAGE;
// wxRadioBox creation
// ----------------------------------------------------------------------------
-wxRadioBox::wxRadioBox()
-{
- Init();
-}
-
-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)
-{
- Init();
-
- (void)Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
-}
-
void wxRadioBox::Init()
{
m_selection = -1;
// wxRadioButton
// ----------------------------------------------------------------------------
-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);
-}
-
bool wxRadioButton::Create(wxWindow *parent,
wxWindowID id,
const wxString &label,
// creation
// ----------------------------------------------------------------------------
-wxTextCtrl::wxTextCtrl()
-{
- Init();
-}
-
-wxTextCtrl::wxTextCtrl(wxWindow *parent,
- wxWindowID id,
- const wxString& value,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxValidator& validator,
- const wxString& name)
-{
- Init();
-
- Create(parent, id, value, pos, size, style, validator, name);
-}
-
void wxTextCtrl::Init()
{
m_selAnchor =
// wxToolBar creation
// ----------------------------------------------------------------------------
-wxToolBar::wxToolBar()
-{
- Init();
-}
-
-wxToolBar::wxToolBar(wxWindow *parent,
- wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
-{
- Init();
-
- Create(parent, id, pos, size, style, name);
-}
-
void wxToolBar::Init()
{
// no tools yet
int wxTopLevelWindow::ms_drawDecorations = -1;
int wxTopLevelWindow::ms_canIconize = -1;
-wxTopLevelWindow::wxTopLevelWindow()
-{
- Init();
-}
-
-wxTopLevelWindow::wxTopLevelWindow(wxWindow *parent,
- wxWindowID id,
- const wxString& title,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
-{
- Init();
-
- Create(parent, id, title, pos, size, style, name);
-}
-
void wxTopLevelWindow::Init()
{
m_isActive = FALSE;
// creation
// ----------------------------------------------------------------------------
-wxWindow::wxWindow()
-{
- Init();
-}
-
-wxWindow::wxWindow(wxWindow *parent,
- wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
- : wxWindowNative(parent, id, pos, size, style | wxCLIP_CHILDREN, name)
-{
- Init();
-}
-
void wxWindow::Init()
{
m_scrollbarVert =
projects / wxWidgets.git / commitdiff
