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

GetSize() and GetClientSize() changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-02-22 11:01:13 +00:00
parent 1edddaf24c
commit bfc6fde4b1
80 changed files with 3467 additions and 3259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/generic/laywin.h
View File

@@ -67,22 +67,24 @@ public:
m_alignment = wxLAYOUT_TOP;
m_orientation = wxLAYOUT_HORIZONTAL;
}
// Read by the app
inline void SetRequestedLength(int length) { m_requestedLength = length; }
inline int GetRequestedLength() const { return m_requestedLength; }
inline void SetFlags(int flags) { m_flags = flags; }
inline int GetFlags() const { return m_flags; }
// Read by the app
void SetRequestedLength(int length) { m_requestedLength = length; }
int GetRequestedLength() const { return m_requestedLength; }
void SetFlags(int flags) { m_flags = flags; }
int GetFlags() const { return m_flags; }
// Set by the app
inline void SetSize(const wxSize& size) { m_size = size; }
inline wxSize GetSize() const { return m_size; }
void SetSize(const wxSize& size) { m_size = size; }
wxSize GetSize() const { return m_size; }
inline void SetOrientation(wxLayoutOrientation orient) { m_orientation = orient; }
inline wxLayoutOrientation GetOrientation() const { return m_orientation; }
void SetOrientation(wxLayoutOrientation orient) { m_orientation = orient; }
wxLayoutOrientation GetOrientation() const { return m_orientation; }
void SetAlignment(wxLayoutAlignment align) { m_alignment = align; }
wxLayoutAlignment GetAlignment() const { return m_alignment; }
inline void SetAlignment(wxLayoutAlignment align) { m_alignment = align; }
inline wxLayoutAlignment GetAlignment() const { return m_alignment; }
protected:
int m_flags;
int m_requestedLength;

36
include/wx/generic/tabg.h
View File

@@ -37,30 +37,30 @@ public:
~wxTabControl(void);
virtual void OnDraw(wxDC& dc, bool lastInRow);
inline void SetLabel(const wxString& str) { m_controlLabel = str; }
inline wxString GetLabel(void) const { return m_controlLabel; }
void SetLabel(const wxString& str) { m_controlLabel = str; }
wxString GetLabel(void) const { return m_controlLabel; }
inline void SetFont(const wxFont& f) { m_labelFont = f; }
inline wxFont *GetFont(void) const { return (wxFont*) & m_labelFont; }
void SetFont(const wxFont& f) { m_labelFont = f; }
wxFont *GetFont(void) const { return (wxFont*) & m_labelFont; }
inline void SetSelected(bool sel) { m_isSelected = sel; }
inline bool IsSelected(void) const { return m_isSelected; }
void SetSelected(bool sel) { m_isSelected = sel; }
bool IsSelected(void) const { return m_isSelected; }
inline void SetPosition(int x, int y) { m_offsetX = x; m_offsetY = y; }
inline void SetSize(int x, int y) { m_width = x; m_height = y; }
void SetPosition(int x, int y) { m_offsetX = x; m_offsetY = y; }
void SetSize(int x, int y) { m_width = x; m_height = y; }
inline void SetRowPosition(int r) { m_rowPosition = r; }
inline int GetRowPosition() const { return m_rowPosition; }
inline void SetColPosition(int c) { m_colPosition = c; }
inline int GetColPosition() const { return m_colPosition; }
void SetRowPosition(int r) { m_rowPosition = r; }
int GetRowPosition() const { return m_rowPosition; }
void SetColPosition(int c) { m_colPosition = c; }
int GetColPosition() const { return m_colPosition; }
inline int GetX(void) const { return m_offsetX; }
inline int GetY(void) const { return m_offsetY; }
inline int GetWidth(void) const { return m_width; }
inline int GetHeight(void) const { return m_height; }
int GetX(void) const { return m_offsetX; }
int GetY(void) const { return m_offsetY; }
int GetWidth(void) const { return m_width; }
int GetHeight(void) const { return m_height; }
inline int GetId(void) const { return m_id; }
inline void SetId(int i) { m_id = i; }
int GetId(void) const { return m_id; }
void SetId(int i) { m_id = i; }
virtual bool HitTest(int x, int y) const ;

10
include/wx/gtk/dialog.h
View File

@@ -70,10 +70,6 @@ public:
bool Destroy();
virtual void SetSize( int x, int y, int width, int height,
int sizeFlags = wxSIZE_AUTO );
virtual void SetSize( int width, int height );
virtual bool Show( bool show );
virtual int ShowModal();
virtual void EndModal( int retCode );
@@ -100,6 +96,12 @@ public:
wxString m_title;
wxIcon m_icon;
protected:
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
private:
DECLARE_EVENT_TABLE()
};

17
include/wx/gtk/frame.h
View File

@@ -47,8 +47,8 @@ extern const char *wxToolBarNameStr;
class wxFrame: public wxWindow
{
DECLARE_DYNAMIC_CLASS(wxFrame)
public:
public:
wxFrame();
wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
@@ -63,13 +63,6 @@ public:
virtual void Centre( int direction = wxHORIZONTAL );
virtual void GetClientSize( int *width, int *height ) const;
wxSize GetClientSize() const { int w, h; GetClientSize(& w, & h); return wxSize(w, h); }
virtual void SetClientSize( int width, int height );
virtual void SetSize( int x, int y, int width, int height,
int sizeFlags = wxSIZE_AUTO );
virtual void SetSize( int width, int height );
virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
const wxString& name = "statusBar");
@@ -121,6 +114,14 @@ public:
wxIcon m_icon;
int m_miniEdge,m_miniTitle;
protected:
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
virtual void DoSetClientSize(int width, int height);
private:
DECLARE_EVENT_TABLE()
};

7
include/wx/gtk/mdi.h
View File

@@ -131,8 +131,11 @@ class wxMDIChildFrame: public wxFrame
virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {}
// no size hints
virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW),
int WXUNUSED(maxH), int WXUNUSED(incW) ) {}
virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH),
int WXUNUSED(maxW), int WXUNUSED(maxH),
int WXUNUSED(incW) )
{
}
// no toolbar bars
virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id),

160
include/wx/gtk/window.h
View File

@@ -36,7 +36,7 @@ extern wxList wxTopLevelWindows;
// global function
//-----------------------------------------------------------------------------
wxWindow* wxGetActiveWindow();
extern wxWindow* wxGetActiveWindow();
//-----------------------------------------------------------------------------
// classes
@@ -117,6 +117,8 @@ class wxWindow: public wxEvtHandler
DECLARE_DYNAMIC_CLASS(wxWindow)
public:
// creating the window
// -------------------
wxWindow();
wxWindow(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
@@ -131,54 +133,125 @@ public:
virtual ~wxWindow();
#if wxUSE_WX_RESOURCES
virtual bool LoadFromResource( wxWindow *parent, const wxString& resourceName,
virtual bool LoadFromResource(wxWindow *parent,
const wxString& resourceName,
const wxResourceTable *table = (const wxResourceTable *) NULL);
virtual wxControl *CreateItem(const wxItemResource* childResource, const wxItemResource* parentResource,
virtual wxControl *CreateItem(const wxItemResource* childResource,
const wxItemResource* parentResource,
const wxResourceTable *table = (const wxResourceTable *) NULL);
#endif
#endif // wxUSE_WX_RESOURCES
// closing the window
// ------------------
bool Close( bool force = FALSE );
virtual bool Destroy();
virtual bool DestroyChildren();
virtual void PrepareDC( wxDC &dc );
bool IsBeingDeleted();
virtual void SetSize( int x, int y, int width, int height,
int sizeFlags = wxSIZE_AUTO );
virtual void SetSize( int width, int height );
// moving/resizing
// ---------------
virtual void Move( int x, int y );
// set the window size and/or position
void SetSize( int x, int y, int width, int height,
int sizeFlags = wxSIZE_AUTO )
{ DoSetSize(x, y, width, height, sizeFlags); }
void SetSize( int width, int height )
{ DoSetSize( -1, -1, width, height, wxSIZE_USE_EXISTING ); }
void SetSize( const wxSize& size )
{ SetSize( size.x, size.y); }
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ DoSetSize(rect.x, rect.y, rect.width, rect.height, sizeFlags); }
void Move( int x, int y )
{ DoSetSize( x, y, -1, -1, wxSIZE_USE_EXISTING ); }
void Move(const wxPoint& pt)
{ Move(pt.x, pt.y); }
// client size is the size of area available for subwindows
void SetClientSize( int width, int height )
{ DoSetClientSize(width, height); }
void SetClientSize( const wxSize& size )
{ DoSetClientSize(size.x, size.y); }
void SetClientSize(const wxRect& rect)
{ SetClientSize( rect.width, rect.height ); }
// get the window position and/or size
virtual void GetPosition( int *x, int *y ) const;
wxPoint GetPosition() const
{
int w, h;
GetPosition(& w, & h);
return wxPoint(w, h);
}
virtual void GetSize( int *width, int *height ) const;
wxSize GetSize() const { int w, h; GetSize(& w, & h); return wxSize(w, h); }
virtual void SetClientSize( int width, int height );
virtual void GetClientSize( int *width, int *height ) const;
wxSize GetClientSize() const { int w, h; GetClientSize(& w, & h); return wxSize(w, h); }
virtual void GetPosition( int *x, int *y ) const;
wxPoint GetPosition() const { int w, h; GetPosition(& w, & h); return wxPoint(w, h); }
wxSize GetSize() const
{
int w, h;
GetSize(& w, & h);
return wxSize(w, h);
}
wxRect GetRect() const
{ int x, y, w, h; GetPosition(& x, & y); GetSize(& w, & h); return wxRect(x, y, w, h); }
{
int x, y, w, h;
GetPosition(& x, & y);
GetSize(& w, & h);
return wxRect(x, y, w, h);
}
virtual void GetClientSize( int *width, int *height ) const;
wxSize GetClientSize() const
{
int w, h;
GetClientSize(& w, & h);
return wxSize(w, h);
}
// position with respect to the the parent window
virtual void Centre( int direction = wxHORIZONTAL );
inline void Center(int direction = wxHORIZONTAL) { Centre(direction); }
void Center(int direction = wxHORIZONTAL) { Centre(direction); }
virtual void Fit();
virtual void SetSizeHints( int minW, int minH, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1 );
// set min/max size of the window
virtual void SetSizeHints( int minW, int minH,
int maxW = -1, int maxH = -1,
int incW = -1, int incH = -1 );
// Dialog units translations. Implemented in wincmn.cpp.
// -----------------------------------------------------
/* Dialog units translations. Implemented in wincmn.cpp. */
wxPoint ConvertPixelsToDialog( const wxPoint& pt );
wxPoint ConvertDialogToPixels( const wxPoint& pt );
inline wxSize ConvertPixelsToDialog( const wxSize& sz )
{ wxPoint pt(ConvertPixelsToDialog(wxPoint(sz.x, sz.y))); return wxSize(pt.x, pt.y); }
inline wxSize ConvertDialogToPixels( const wxSize& sz )
{ wxPoint pt(ConvertDialogToPixels(wxPoint(sz.x, sz.y))); return wxSize(pt.x, pt.y); }
wxSize ConvertPixelsToDialog( const wxSize& sz )
{
wxPoint pt(ConvertPixelsToDialog(wxPoint(sz.x, sz.y)));
return wxSize(pt.x, pt.y);
}
wxSize ConvertDialogToPixels( const wxSize& sz )
{
wxPoint pt(ConvertDialogToPixels(wxPoint(sz.x, sz.y)));
return wxSize(pt.x, pt.y);
}
void OnSize( wxSizeEvent &event );
// window state
// ------------
virtual bool Show( bool show );
virtual void Enable( bool enable );
virtual void MakeModal( bool modal );
@@ -188,12 +261,16 @@ public:
virtual void SetFocus();
static wxWindow *FindFocus();
void SetReturnCode( int retCode );
int GetReturnCode();
// parent/children relations
// -------------------------
virtual void AddChild( wxWindow *child );
wxList& GetChildren() { return m_children; }
virtual void RemoveChild( wxWindow *child );
void SetReturnCode( int retCode );
int GetReturnCode();
wxWindow *GetParent() const
{ return m_parent; }
@@ -203,11 +280,17 @@ public:
{ m_parent = parent; }
virtual wxWindow *ReParent( wxWindow *newParent );
// event handler stuff
// -------------------
wxEvtHandler *GetEventHandler() const;
void SetEventHandler( wxEvtHandler *handler );
void PushEventHandler( wxEvtHandler *handler );
wxEvtHandler *PopEventHandler( bool deleteHandler = FALSE );
// validators and client data
// --------------------------
virtual void SetValidator( const wxValidator &validator );
virtual wxValidator *GetValidator();
@@ -217,16 +300,18 @@ public:
virtual void SetClientData( void *data );
virtual void *GetClientData();
// accelerators
// ------------
virtual void SetAcceleratorTable( const wxAcceleratorTable& accel );
virtual wxAcceleratorTable *GetAcceleratorTable() { return &m_acceleratorTable; }
bool IsBeingDeleted();
void SetId( wxWindowID id );
wxWindowID GetId() const;
void SetCursor( const wxCursor &cursor );
virtual void PrepareDC( wxDC &dc );
void WarpPointer(int x, int y);
#if wxUSE_TOOLTIPS
@@ -244,11 +329,17 @@ public:
virtual bool IsExposed( const wxPoint& pt ) const;
virtual bool IsExposed( const wxRect& rect ) const;
// colours
// -------
virtual wxColour GetBackgroundColour() const;
virtual void SetBackgroundColour( const wxColour &colour );
virtual wxColour GetForegroundColour() const;
virtual void SetForegroundColour( const wxColour &colour );
// fonts
// -----
virtual int GetCharHeight() const;
virtual int GetCharWidth() const;
virtual void GetTextExtent( const wxString& string, int *x, int *y,
@@ -440,6 +531,17 @@ public:
virtual void GetClientSizeConstraint(int *w, int *h) const ;
virtual void GetPositionConstraint(int *x, int *y) const ;
protected:
// this is the virtual function to be overriden in any derived class which
// wants to change how SetSize() or Move() works - it is called by all
// versions of these functions in the base class
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
// same as DoSetSize() for the client size
virtual void DoSetClientSize(int width, int height);
private:
DECLARE_EVENT_TABLE()
};

10
include/wx/gtk1/dialog.h
View File

@@ -70,10 +70,6 @@ public:
bool Destroy();
virtual void SetSize( int x, int y, int width, int height,
int sizeFlags = wxSIZE_AUTO );
virtual void SetSize( int width, int height );
virtual bool Show( bool show );
virtual int ShowModal();
virtual void EndModal( int retCode );
@@ -100,6 +96,12 @@ public:
wxString m_title;
wxIcon m_icon;
protected:
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
private:
DECLARE_EVENT_TABLE()
};

17
include/wx/gtk1/frame.h
View File

@@ -47,8 +47,8 @@ extern const char *wxToolBarNameStr;
class wxFrame: public wxWindow
{
DECLARE_DYNAMIC_CLASS(wxFrame)
public:
public:
wxFrame();
wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
@@ -63,13 +63,6 @@ public:
virtual void Centre( int direction = wxHORIZONTAL );
virtual void GetClientSize( int *width, int *height ) const;
wxSize GetClientSize() const { int w, h; GetClientSize(& w, & h); return wxSize(w, h); }
virtual void SetClientSize( int width, int height );
virtual void SetSize( int x, int y, int width, int height,
int sizeFlags = wxSIZE_AUTO );
virtual void SetSize( int width, int height );
virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
const wxString& name = "statusBar");
@@ -121,6 +114,14 @@ public:
wxIcon m_icon;
int m_miniEdge,m_miniTitle;
protected:
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
virtual void DoSetClientSize(int width, int height);
private:
DECLARE_EVENT_TABLE()
};

7
include/wx/gtk1/mdi.h
View File

@@ -131,8 +131,11 @@ class wxMDIChildFrame: public wxFrame
virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {}
// no size hints
virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW),
int WXUNUSED(maxH), int WXUNUSED(incW) ) {}
virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH),
int WXUNUSED(maxW), int WXUNUSED(maxH),
int WXUNUSED(incW) )
{
}
// no toolbar bars
virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id),

160
include/wx/gtk1/window.h
View File

@@ -36,7 +36,7 @@ extern wxList wxTopLevelWindows;
// global function
//-----------------------------------------------------------------------------
wxWindow* wxGetActiveWindow();
extern wxWindow* wxGetActiveWindow();
//-----------------------------------------------------------------------------
// classes
@@ -117,6 +117,8 @@ class wxWindow: public wxEvtHandler
DECLARE_DYNAMIC_CLASS(wxWindow)
public:
// creating the window
// -------------------
wxWindow();
wxWindow(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
@@ -131,54 +133,125 @@ public:
virtual ~wxWindow();
#if wxUSE_WX_RESOURCES
virtual bool LoadFromResource( wxWindow *parent, const wxString& resourceName,
virtual bool LoadFromResource(wxWindow *parent,
const wxString& resourceName,
const wxResourceTable *table = (const wxResourceTable *) NULL);
virtual wxControl *CreateItem(const wxItemResource* childResource, const wxItemResource* parentResource,
virtual wxControl *CreateItem(const wxItemResource* childResource,
const wxItemResource* parentResource,
const wxResourceTable *table = (const wxResourceTable *) NULL);
#endif
#endif // wxUSE_WX_RESOURCES
// closing the window
// ------------------
bool Close( bool force = FALSE );
virtual bool Destroy();
virtual bool DestroyChildren();
virtual void PrepareDC( wxDC &dc );
bool IsBeingDeleted();
virtual void SetSize( int x, int y, int width, int height,
int sizeFlags = wxSIZE_AUTO );
virtual void SetSize( int width, int height );
// moving/resizing
// ---------------
virtual void Move( int x, int y );
// set the window size and/or position
void SetSize( int x, int y, int width, int height,
int sizeFlags = wxSIZE_AUTO )
{ DoSetSize(x, y, width, height, sizeFlags); }
void SetSize( int width, int height )
{ DoSetSize( -1, -1, width, height, wxSIZE_USE_EXISTING ); }
void SetSize( const wxSize& size )
{ SetSize( size.x, size.y); }
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ DoSetSize(rect.x, rect.y, rect.width, rect.height, sizeFlags); }
void Move( int x, int y )
{ DoSetSize( x, y, -1, -1, wxSIZE_USE_EXISTING ); }
void Move(const wxPoint& pt)
{ Move(pt.x, pt.y); }
// client size is the size of area available for subwindows
void SetClientSize( int width, int height )
{ DoSetClientSize(width, height); }
void SetClientSize( const wxSize& size )
{ DoSetClientSize(size.x, size.y); }
void SetClientSize(const wxRect& rect)
{ SetClientSize( rect.width, rect.height ); }
// get the window position and/or size
virtual void GetPosition( int *x, int *y ) const;
wxPoint GetPosition() const
{
int w, h;
GetPosition(& w, & h);
return wxPoint(w, h);
}
virtual void GetSize( int *width, int *height ) const;
wxSize GetSize() const { int w, h; GetSize(& w, & h); return wxSize(w, h); }
virtual void SetClientSize( int width, int height );
virtual void GetClientSize( int *width, int *height ) const;
wxSize GetClientSize() const { int w, h; GetClientSize(& w, & h); return wxSize(w, h); }
virtual void GetPosition( int *x, int *y ) const;
wxPoint GetPosition() const { int w, h; GetPosition(& w, & h); return wxPoint(w, h); }
wxSize GetSize() const
{
int w, h;
GetSize(& w, & h);
return wxSize(w, h);
}
wxRect GetRect() const
{ int x, y, w, h; GetPosition(& x, & y); GetSize(& w, & h); return wxRect(x, y, w, h); }
{
int x, y, w, h;
GetPosition(& x, & y);
GetSize(& w, & h);
return wxRect(x, y, w, h);
}
virtual void GetClientSize( int *width, int *height ) const;
wxSize GetClientSize() const
{
int w, h;
GetClientSize(& w, & h);
return wxSize(w, h);
}
// position with respect to the the parent window
virtual void Centre( int direction = wxHORIZONTAL );
inline void Center(int direction = wxHORIZONTAL) { Centre(direction); }
void Center(int direction = wxHORIZONTAL) { Centre(direction); }
virtual void Fit();
virtual void SetSizeHints( int minW, int minH, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1 );
// set min/max size of the window
virtual void SetSizeHints( int minW, int minH,
int maxW = -1, int maxH = -1,
int incW = -1, int incH = -1 );
// Dialog units translations. Implemented in wincmn.cpp.
// -----------------------------------------------------
/* Dialog units translations. Implemented in wincmn.cpp. */
wxPoint ConvertPixelsToDialog( const wxPoint& pt );
wxPoint ConvertDialogToPixels( const wxPoint& pt );
inline wxSize ConvertPixelsToDialog( const wxSize& sz )
{ wxPoint pt(ConvertPixelsToDialog(wxPoint(sz.x, sz.y))); return wxSize(pt.x, pt.y); }
inline wxSize ConvertDialogToPixels( const wxSize& sz )
{ wxPoint pt(ConvertDialogToPixels(wxPoint(sz.x, sz.y))); return wxSize(pt.x, pt.y); }
wxSize ConvertPixelsToDialog( const wxSize& sz )
{
wxPoint pt(ConvertPixelsToDialog(wxPoint(sz.x, sz.y)));
return wxSize(pt.x, pt.y);
}
wxSize ConvertDialogToPixels( const wxSize& sz )
{
wxPoint pt(ConvertDialogToPixels(wxPoint(sz.x, sz.y)));
return wxSize(pt.x, pt.y);
}
void OnSize( wxSizeEvent &event );
// window state
// ------------
virtual bool Show( bool show );
virtual void Enable( bool enable );
virtual void MakeModal( bool modal );
@@ -188,12 +261,16 @@ public:
virtual void SetFocus();
static wxWindow *FindFocus();
void SetReturnCode( int retCode );
int GetReturnCode();
// parent/children relations
// -------------------------
virtual void AddChild( wxWindow *child );
wxList& GetChildren() { return m_children; }
virtual void RemoveChild( wxWindow *child );
void SetReturnCode( int retCode );
int GetReturnCode();
wxWindow *GetParent() const
{ return m_parent; }
@@ -203,11 +280,17 @@ public:
{ m_parent = parent; }
virtual wxWindow *ReParent( wxWindow *newParent );
// event handler stuff
// -------------------
wxEvtHandler *GetEventHandler() const;
void SetEventHandler( wxEvtHandler *handler );
void PushEventHandler( wxEvtHandler *handler );
wxEvtHandler *PopEventHandler( bool deleteHandler = FALSE );
// validators and client data
// --------------------------
virtual void SetValidator( const wxValidator &validator );
virtual wxValidator *GetValidator();
@@ -217,16 +300,18 @@ public:
virtual void SetClientData( void *data );
virtual void *GetClientData();
// accelerators
// ------------
virtual void SetAcceleratorTable( const wxAcceleratorTable& accel );
virtual wxAcceleratorTable *GetAcceleratorTable() { return &m_acceleratorTable; }
bool IsBeingDeleted();
void SetId( wxWindowID id );
wxWindowID GetId() const;
void SetCursor( const wxCursor &cursor );
virtual void PrepareDC( wxDC &dc );
void WarpPointer(int x, int y);
#if wxUSE_TOOLTIPS
@@ -244,11 +329,17 @@ public:
virtual bool IsExposed( const wxPoint& pt ) const;
virtual bool IsExposed( const wxRect& rect ) const;
// colours
// -------
virtual wxColour GetBackgroundColour() const;
virtual void SetBackgroundColour( const wxColour &colour );
virtual wxColour GetForegroundColour() const;
virtual void SetForegroundColour( const wxColour &colour );
// fonts
// -----
virtual int GetCharHeight() const;
virtual int GetCharWidth() const;
virtual void GetTextExtent( const wxString& string, int *x, int *y,
@@ -440,6 +531,17 @@ public:
virtual void GetClientSizeConstraint(int *w, int *h) const ;
virtual void GetPositionConstraint(int *x, int *y) const ;
protected:
// this is the virtual function to be overriden in any derived class which
// wants to change how SetSize() or Move() works - it is called by all
// versions of these functions in the base class
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
// same as DoSetSize() for the client size
virtual void DoSetClientSize(int width, int height);
private:
DECLARE_EVENT_TABLE()
};

16
include/wx/layout.h
View File

@@ -232,21 +232,11 @@ public:
bool Create(wxWindow *parent, wxSizerBehaviour behav = wxSizerNone);
virtual void SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO);
virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect.x, rect.y, rect.width, rect.height, sizeFlags); }
virtual void SetSize(const wxSize& size)
{ wxWindow::SetSize(size.x, size.y); }
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
virtual void GetSize(int *w, int *h) const;
wxSize GetSize() const { return wxWindow::GetSize(); }
virtual void GetClientSize(int *w, int *h) const { GetSize(w, h); }
wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
virtual void GetPosition(int *x, int *y) const;
wxPoint GetPosition() const { return wxWindow::GetPosition(); }
void SizerSetSize(int x, int y, int w, int h) { SetSize(x, y, w, h); }
void SizerMove(int x, int y) { Move(x, y); }
@@ -263,6 +253,11 @@ public:
virtual bool LayoutPhase1(int *);
virtual bool LayoutPhase2(int *);
protected:
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
};
#define wxSIZER_ROWS TRUE
@@ -287,7 +282,6 @@ public:
bool Create(wxWindow *parent, bool rowOrCol = wxSIZER_ROWS,
int rowsOrColSize = 20, wxSizerBehaviour = wxSizerShrink);
virtual void SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO);
virtual void SetRowOrCol(bool rc) { rowOrCol = rc; }
virtual bool GetRowOrCol() { return rowOrCol; }

13
include/wx/motif/checkbox.h
View File

@@ -76,17 +76,16 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr);
virtual void SetValue(bool);
virtual void SetValue(bool value);
virtual bool GetValue() const;
virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
virtual void SetLabel(const wxBitmap& bitmap);
virtual void SetLabel(const wxString& label) { wxControl::SetLabel(label); };
protected:
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
};
#endif
// _WX_CHECKBOX_H_

14
include/wx/motif/choice.h
View File

@@ -29,7 +29,7 @@ class WXDLLEXPORT wxChoice: public wxControl
wxChoice();
~wxChoice();
inline wxChoice(wxWindow *parent, wxWindowID id,
wxChoice(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
@@ -56,16 +56,10 @@ class WXDLLEXPORT wxChoice: public wxControl
virtual int FindString(const wxString& s) const;
virtual wxString GetString(int n) const ;
virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
virtual wxString GetStringSelection() const ;
virtual bool SetStringSelection(const wxString& sel);
virtual inline int Number() const { return m_noStrings; }
virtual int Number() const { return m_noStrings; }
virtual void Command(wxCommandEvent& event);
virtual void SetColumns(int n = 1 );
@@ -87,6 +81,10 @@ protected:
WXWidget* m_widgetList ;
WXWidget m_formWidget;
wxStringList m_stringList;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
};
#endif

11
include/wx/motif/combobox.h
View File

@@ -51,12 +51,6 @@ class WXDLLEXPORT wxComboBox: public wxChoice
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr);
virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
// List functions
virtual void Append(const wxString& item);
virtual void Delete(int n);
@@ -92,6 +86,11 @@ class WXDLLEXPORT wxComboBox: public wxChoice
virtual void ChangeForegroundColour();
WXWidget GetTopWidget() const { return m_mainWidget; }
WXWidget GetMainWidget() const { return m_mainWidget; }
protected:
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
};
#endif

23
include/wx/motif/dialog.h
View File

@@ -24,12 +24,12 @@ WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
class WXDLLEXPORT wxDialog : public wxPanel
{
DECLARE_DYNAMIC_CLASS(wxDialog)
public:
public:
wxDialog();
// Constructor with a modal flag, but no window id - the old convention
inline wxDialog(wxWindow *parent,
wxDialog(wxWindow *parent,
const wxString& title, bool modal,
int x = -1, int y= -1, int width = 500, int height = 500,
long style = wxDEFAULT_DIALOG_STYLE,
@@ -40,7 +40,7 @@ public:
}
// Constructor with no modal flag - the new convention.
inline wxDialog(wxWindow *parent, wxWindowID id,
wxDialog(wxWindow *parent, wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@@ -60,14 +60,6 @@ public:
~wxDialog();
virtual bool Destroy();
void SetClientSize(int width, int height);
void SetClientSize(const wxSize& size) { wxWindow::SetClientSize(size); }
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
bool Show(bool show);
void Iconize(bool iconize);
@@ -107,12 +99,19 @@ public:
inline WXWidget GetTopWidget() const { return m_mainWidget; }
inline WXWidget GetClientWidget() const { return m_mainWidget; }
public:
//// Motif-specific
bool m_modalShowing;
wxString m_dialogTitle;
protected:
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
virtual void DoSetClientSize(int width, int height);
private:
DECLARE_EVENT_TABLE()
};

42
include/wx/motif/frame.h
View File

@@ -26,13 +26,13 @@ WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxStatusBar;
class WXDLLEXPORT wxFrame: public wxWindow {
class WXDLLEXPORT wxFrame : public wxWindow
{
DECLARE_DYNAMIC_CLASS(wxFrame)
public:
wxFrame();
inline wxFrame(wxWindow *parent,
wxFrame(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
@@ -56,22 +56,9 @@ public:
virtual bool Destroy();
void SetClientSize(int width, int height);
void SetClientSize(const wxSize& size) { wxWindow::SetClientSize(size); }
void GetClientSize(int *width, int *height) const;
wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
void GetSize(int *width, int *height) const ;
wxSize GetSize() const { return wxWindow::GetSize(); }
void GetPosition(int *x, int *y) const ;
wxPoint GetPosition() const { return wxWindow::GetPosition(); }
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
void ClientToScreen(int *x, int *y) const;
wxPoint ClientToScreen(const wxPoint& pt) const { return wxWindow::ClientToScreen(pt); }
@@ -93,7 +80,7 @@ public:
// Set title
void SetTitle(const wxString& title);
inline wxString GetTitle() const { return m_title; }
wxString GetTitle() const { return m_title; }
void Centre(int direction = wxBOTH);
@@ -107,7 +94,7 @@ public:
// Create status line
virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
const wxString& name = "statusBar");
inline wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
virtual void PositionStatusBar();
virtual wxStatusBar *OnCreateStatusBar(int number, long style, wxWindowID id,
const wxString& name);
@@ -142,7 +129,7 @@ public:
virtual bool IsIconized() const ;
// Compatibility
inline bool Iconized() const { return IsIconized(); }
bool Iconized() const { return IsIconized(); }
// Is the frame maximized? Returns FALSE under Motif (but TRUE for
// wxMDIChildFrame due to the tabbed implementation).
@@ -171,11 +158,11 @@ public:
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
WXWidget GetMenuBarWidget() const ;
inline WXWidget GetShellWidget() const { return m_frameShell; }
inline WXWidget GetWorkAreaWidget() const { return m_workArea; }
inline WXWidget GetClientAreaWidget() const { return m_clientArea; }
inline WXWidget GetTopWidget() const { return m_frameShell; }
inline WXWidget GetMainWindowWidget() const { return m_frameWidget; }
WXWidget GetShellWidget() const { return m_frameShell; }
WXWidget GetWorkAreaWidget() const { return m_workArea; }
WXWidget GetClientAreaWidget() const { return m_clientArea; }
WXWidget GetTopWidget() const { return m_frameShell; }
WXWidget GetMainWindowWidget() const { return m_frameWidget; }
// The widget that can have children on it
WXWidget GetClientWidget() const;
@@ -204,6 +191,13 @@ protected:
bool m_visibleStatus;
wxString m_title;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
virtual void DoSetClientSize(int width, int height);
private:
DECLARE_EVENT_TABLE()
};

7
include/wx/motif/gauge.h
View File

@@ -24,6 +24,7 @@ WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
class WXDLLEXPORT wxGauge : public wxControl
{
DECLARE_DYNAMIC_CLASS(wxGauge)
public:
inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; }
@@ -56,12 +57,6 @@ class WXDLLEXPORT wxGauge: public wxControl
int GetRange() const ;
int GetValue() const ;
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
// Implementation

14
include/wx/motif/listbox.h
View File

@@ -29,10 +29,10 @@ WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
class WXDLLEXPORT wxListBox: public wxControl
{
DECLARE_DYNAMIC_CLASS(wxListBox)
public:
public:
wxListBox();
inline wxListBox(wxWindow *parent, wxWindowID id,
wxListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
@@ -77,12 +77,6 @@ class WXDLLEXPORT wxListBox: public wxControl
virtual bool Selected(int n) const ;
virtual wxString GetString(int n) const ;
virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
// Set the specified item at the first visible item
// or scroll to max range.
virtual void SetFirstItem(int n) ;
@@ -108,6 +102,10 @@ protected:
// List mapping positions->client data
wxList m_clientDataList;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
};
#endif

57
include/wx/motif/mdi.h
View File

@@ -117,10 +117,10 @@ DECLARE_EVENT_TABLE()
class WXDLLEXPORT wxMDIChildFrame: public wxFrame
{
DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
public:
public:
wxMDIChildFrame();
inline wxMDIChildFrame(wxMDIParentFrame *parent,
wxMDIChildFrame(wxMDIParentFrame *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
@@ -146,22 +146,9 @@ public:
void SetTitle(const wxString& title);
void SetClientSize(int width, int height);
void SetClientSize(const wxSize& size) { wxWindow::SetClientSize(size); }
void GetClientSize(int *width, int *height) const;
wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
void GetClientSize(int *width, int *height);
void GetSize(int *width, int *height) const;
wxSize GetSize() const { return wxWindow::GetSize(); }
void GetPosition(int *x, int *y) const ;
wxPoint GetPosition() const { return wxWindow::GetPosition(); }
// Set icon
virtual void SetIcon(const wxIcon& icon);
@@ -188,20 +175,25 @@ public:
bool Show(bool show);
inline WXWidget GetMainWidget() const { return m_mainWidget; };
inline WXWidget GetTopWidget() const { return m_mainWidget; };
inline WXWidget GetClientWidget() const { return m_mainWidget; };
WXWidget GetMainWidget() const { return m_mainWidget; };
WXWidget GetTopWidget() const { return m_mainWidget; };
WXWidget GetClientWidget() const { return m_mainWidget; };
/*
virtual void OnRaise();
virtual void OnLower();
*/
inline void SetMDIParentFrame(wxMDIParentFrame* parentFrame) { m_mdiParentFrame = parentFrame; }
inline wxMDIParentFrame* GetMDIParentFrame() const { return m_mdiParentFrame; }
void SetMDIParentFrame(wxMDIParentFrame* parentFrame) { m_mdiParentFrame = parentFrame; }
wxMDIParentFrame* GetMDIParentFrame() const { return m_mdiParentFrame; }
protected:
wxMDIParentFrame* m_mdiParentFrame;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
virtual void DoSetClientSize(int width, int height);
};
/* The client window is a child of the parent MDI frame, and itself
@@ -214,33 +206,19 @@ protected:
class WXDLLEXPORT wxMDIClientWindow: public wxNotebook
{
DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
public:
public:
wxMDIClientWindow() ;
inline wxMDIClientWindow(wxMDIParentFrame *parent, long style = 0)
wxMDIClientWindow(wxMDIParentFrame *parent, long style = 0)
{
CreateClient(parent, style);
}
~wxMDIClientWindow();
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
void SetClientSize(int width, int height);
void SetClientSize(const wxSize& size) { wxWindow::SetClientSize(size); }
void GetClientSize(int *width, int *height) const;
wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
void GetSize(int *width, int *height) const ;
wxSize GetSize() const { return wxWindow::GetSize(); }
void GetPosition(int *x, int *y) const ;
wxPoint GetPosition() const { return wxWindow::GetPosition(); }
// Note: this is virtual, to allow overridden behaviour.
virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
@@ -252,7 +230,12 @@ class WXDLLEXPORT wxMDIClientWindow: public wxNotebook
void OnPageChanged(wxNotebookEvent& event);
protected:
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
virtual void DoSetClientSize(int width, int height);
private:
DECLARE_EVENT_TABLE()
};

18
include/wx/motif/radiobox.h
View File

@@ -26,10 +26,11 @@ class WXDLLEXPORT wxBitmap ;
class WXDLLEXPORT wxRadioBox : public wxControl
{
DECLARE_DYNAMIC_CLASS(wxRadioBox)
public:
wxRadioBox();
inline wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
int majorDim = 0, long style = wxRA_HORIZONTAL,
@@ -50,11 +51,6 @@ public:
void SetSelection(int N);
int GetSelection() const;
wxString GetString(int N) const;
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
void SetLabel(const wxString& label) { wxControl::SetLabel(label); };
void SetLabel(int item, const wxString& label) ;
@@ -67,11 +63,11 @@ public:
virtual wxString GetStringSelection() const;
virtual bool SetStringSelection(const wxString& s);
inline virtual int Number() const { return m_noItems; } ;
virtual int Number() const { return m_noItems; } ;
void Command(wxCommandEvent& event);
inline int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
// Implementation
virtual void ChangeFont(bool keepOriginalSize = TRUE);
@@ -94,6 +90,10 @@ protected:
WXWidget m_frameWidget;
WXWidget* m_radioButtons;
wxString* m_radioButtonLabels;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
};
#endif

16
include/wx/motif/slider.h
View File

@@ -28,7 +28,7 @@ class WXDLLEXPORT wxSlider: public wxControl
public:
wxSlider();
inline wxSlider(wxWindow *parent, wxWindowID id,
wxSlider(wxWindow *parent, wxWindowID id,
int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@@ -51,14 +51,8 @@ public:
virtual int GetValue() const ;
virtual void SetValue(int);
void GetSize(int *x, int *y) const ;
wxSize GetSize() const { return wxWindow::GetSize(); }
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
void GetSize(int *x, int *y) const ;
void SetRange(int minValue, int maxValue);
@@ -94,6 +88,12 @@ public:
int m_pageSize;
int m_lineSize;
int m_tickFreq;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
private:
DECLARE_EVENT_TABLE()
};

14
include/wx/motif/statbmp.h
View File

@@ -23,11 +23,12 @@ WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
class WXDLLEXPORT wxStaticBitmap : public wxControl
{
DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
public:
inline wxStaticBitmap() { }
wxStaticBitmap() { }
~wxStaticBitmap();
inline wxStaticBitmap(wxWindow *parent, wxWindowID id,
wxStaticBitmap(wxWindow *parent, wxWindowID id,
const wxBitmap& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@@ -49,13 +50,7 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_messageBitmap; }
wxBitmap& GetBitmap() const { return (wxBitmap&) m_messageBitmap; }
// overriden base class virtuals
virtual bool AcceptsFocus() const { return FALSE; }
@@ -67,7 +62,6 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
protected:
wxBitmap m_messageBitmap;
};
#endif

17
include/wx/motif/statbox.h
View File

@@ -27,7 +27,7 @@ class WXDLLEXPORT wxStaticBox: public wxControl
public:
wxStaticBox();
inline wxStaticBox(wxWindow *parent, wxWindowID id,
wxStaticBox(wxWindow *parent, wxWindowID id,
const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@@ -48,12 +48,6 @@ class WXDLLEXPORT wxStaticBox: public wxControl
virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
void SetLabel(const wxString& label);
wxString GetLabel() const;
@@ -64,12 +58,17 @@ class WXDLLEXPORT wxStaticBox: public wxControl
WXWidget GetTopWidget() const { return m_formWidget; }
WXWidget GetLabelWidget() const { return m_labelWidget; }
DECLARE_EVENT_TABLE()
protected:
// Motif-specific
WXWidget m_formWidget;
WXWidget m_labelWidget;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
private:
DECLARE_EVENT_TABLE()
};
#endif

133
include/wx/motif/window.h
View File

@@ -118,7 +118,7 @@ class WXDLLEXPORT wxWindow: public wxEvtHandler
public:
wxWindow();
inline wxWindow(wxWindow *parent, wxWindowID id,
wxWindow(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
@@ -155,7 +155,7 @@ public:
virtual bool IsEnabled() const;
// For compatibility
inline bool Enabled() const { return IsEnabled(); }
bool Enabled() const { return IsEnabled(); }
// Dialog support: override these and call
// base class members to add functionality
@@ -179,7 +179,7 @@ public:
// Set the cursor
virtual void SetCursor(const wxCursor& cursor);
inline virtual wxCursor *GetCursor() const { return (wxCursor *)& m_windowCursor; };
virtual wxCursor *GetCursor() const { return (wxCursor *)& m_windowCursor; };
// Get the window with the focus
static wxWindow *FindFocus();
@@ -188,32 +188,74 @@ public:
virtual int GetCharHeight() const;
virtual int GetCharWidth() const;
// Get overall window size
virtual void GetSize(int *width, int *height) const;
virtual wxSize GetSize() const { int w, h; GetSize(& w, & h); return wxSize(w, h); }
virtual wxRect GetRect() const { int w, h; int x, y; GetPosition(& x, & y); GetSize(& w, & h); return wxRect(x, y, w, h); }
// moving/resizing
// ---------------
// Get window position, relative to parent (or screen if no parent)
// set the window size and/or position
void SetSize( int x, int y, int width, int height,
int sizeFlags = wxSIZE_AUTO )
{ DoSetSize(x, y, width, height, sizeFlags); }
void SetSize( int width, int height )
{ DoSetSize( -1, -1, width, height, wxSIZE_USE_EXISTING ); }
void SetSize( const wxSize& size )
{ SetSize( size.x, size.y); }
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ DoSetSize(rect.x, rect.y, rect.width, rect.height, sizeFlags); }
void Move( int x, int y )
{ DoSetSize( x, y, -1, -1, wxSIZE_USE_EXISTING ); }
void Move(const wxPoint& pt)
{ Move(pt.x, pt.y); }
// client size is the size of area available for subwindows
void SetClientSize( int width, int height )
{ DoSetClientSize(width, height); }
void SetClientSize( const wxSize& size )
{ DoSetClientSize(size.x, size.y); }
void SetClientSize(const wxRect& rect)
{ SetClientSize( rect.width, rect.height ); }
// get the window position and/or size
virtual void GetPosition( int *x, int *y ) const;
virtual wxPoint GetPosition() const { int x, y; GetPosition(&x, &y); return wxPoint(x, y); }
wxPoint GetPosition() const
{
int w, h;
GetPosition(& w, & h);
return wxPoint(w, h);
}
virtual void GetSize( int *width, int *height ) const;
wxSize GetSize() const
{
int w, h;
GetSize(& w, & h);
return wxSize(w, h);
}
wxRect GetRect() const
{
int x, y, w, h;
GetPosition(& x, & y);
GetSize(& w, & h);
return wxRect(x, y, w, h);
}
// Get client (application-useable) size
virtual void GetClientSize( int *width, int *height ) const;
virtual wxSize GetClientSize() const { int w, h; GetClientSize(& w, & h); return wxSize(w, h); }
// Set overall size and position
virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ SetSize(rect.x, rect.y, rect.width, rect.height, sizeFlags); }
virtual void SetSize(const wxSize& size) { SetSize(-1, -1, size.x, size.y, wxSIZE_USE_EXISTING); }
virtual void Move(int x, int y) { SetSize(x, y, -1, -1, wxSIZE_USE_EXISTING); }
virtual void Move(const wxPoint& pt) { SetSize(pt.x, pt.y, -1, -1, wxSIZE_USE_EXISTING); }
// Set client size
virtual void SetClientSize(int width, int size);
virtual void SetClientSize(const wxSize& sz) { SetClientSize(sz.x, sz.y); }
wxSize GetClientSize() const
{
int w, h;
GetClientSize(& w, & h);
return wxSize(w, h);
}
// Convert client to screen coordinates
virtual void ClientToScreen(int *x, int *y) const;
@@ -264,19 +306,19 @@ public:
virtual bool IsExposed(const wxRect& rect) const;
// Set/get the window title
virtual inline void SetTitle(const wxString& WXUNUSED(title)) {};
inline virtual wxString GetTitle() const { return wxString(""); };
virtual void SetTitle(const wxString& WXUNUSED(title)) {};
virtual wxString GetTitle() const { return wxString(""); };
// Most windows have the concept of a label; for frames, this is the
// title; for items, this is the label or button text.
inline virtual wxString GetLabel() const { return GetTitle(); }
virtual wxString GetLabel() const { return GetTitle(); }
// Set/get the window name (used for resource setting in X)
inline virtual wxString GetName() const;
inline virtual void SetName(const wxString& name);
virtual wxString GetName() const;
virtual void SetName(const wxString& name);
// Centre the window
virtual void Centre(int direction) ;
inline void Center(int direction = wxHORIZONTAL) { Centre(direction); }
void Center(int direction = wxHORIZONTAL) { Centre(direction); }
// Popup a menu
virtual bool PopupMenu(wxMenu *menu, int x, int y);
@@ -315,7 +357,7 @@ public:
inline void SetId(int id);
virtual void SetAcceleratorTable(const wxAcceleratorTable& accel);
inline virtual wxAcceleratorTable& GetAcceleratorTable() const { return (wxAcceleratorTable&) m_acceleratorTable; }
virtual wxAcceleratorTable& GetAcceleratorTable() const { return (wxAcceleratorTable&) m_acceleratorTable; }
// Make the window modal (all other windows unresponsive)
virtual void MakeModal(bool modal);
@@ -333,7 +375,7 @@ public:
// Set/get the window's font
virtual void SetFont(const wxFont& f);
inline virtual wxFont& GetFont() const;
virtual wxFont& GetFont() const;
// Set/get the window's validator
void SetValidator(const wxValidator& validator);
@@ -378,15 +420,15 @@ public:
// Set/get window background colour
virtual void SetBackgroundColour(const wxColour& col);
inline virtual wxColour GetBackgroundColour() const;
virtual wxColour GetBackgroundColour() const;
// Set/get window foreground colour
virtual void SetForegroundColour(const wxColour& col);
inline virtual wxColour GetForegroundColour() const;
virtual wxColour GetForegroundColour() const;
// Get the default button, if there is one
inline virtual wxButton *GetDefaultItem() const;
inline virtual void SetDefaultItem(wxButton *but);
virtual wxButton *GetDefaultItem() const;
virtual void SetDefaultItem(wxButton *but);
// Override to define new behaviour for default action (e.g. double clicking
// on a listbox)
@@ -465,7 +507,7 @@ public:
// (but doesn't delete the child object)
virtual void DestroyChildren(); // Removes and destroys all children
inline bool IsBeingDeleted() const { return FALSE; } // TODO: Should probably eliminate this
bool IsBeingDeleted() const { return FALSE; } // TODO: Should probably eliminate this
// Constraint implementation
void UnsetConstraints(wxLayoutConstraints *c);
@@ -552,8 +594,8 @@ public:
virtual WXDisplay *GetXDisplay() const;
virtual WXPixmap GetBackingPixmap() const { return m_backingPixmap; }
inline int GetPixmapWidth() const { return m_pixmapWidth; }
inline int GetPixmapHeight() const { return m_pixmapHeight; }
int GetPixmapWidth() const { return m_pixmapWidth; }
int GetPixmapHeight() const { return m_pixmapHeight; }
// Change properties
virtual void ChangeFont(bool keepOriginalSize = TRUE); // Change to the current font (often overridden)
@@ -663,6 +705,17 @@ protected:
int m_scrollPosY; // since in wxWin the pos isn't
// set automatically by system
// this is the virtual function to be overriden in any derived class which
// wants to change how SetSize() or Move() works - it is called by all
// versions of these functions in the base class
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
// same as DoSetSize() for the client size
virtual void DoSetClientSize(int width, int height);
private:
DECLARE_EVENT_TABLE()
};

19
include/wx/msw/button.h
View File

@@ -25,9 +25,10 @@ WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
class WXDLLEXPORT wxButton : public wxControl
{
DECLARE_DYNAMIC_CLASS(wxButton)
public:
inline wxButton(void) {}
inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
wxButton() { }
wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
@@ -42,18 +43,18 @@ class WXDLLEXPORT wxButton: public wxControl
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr);
virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetDefault(void);
virtual void SetDefault();
virtual void SetLabel(const wxString& label);
virtual wxString GetLabel(void) const ;
virtual wxString GetLabel() const ;
virtual void Command(wxCommandEvent& event);
virtual bool MSWCommand(WXUINT param, WXWORD id);
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
protected:
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
};
#endif

36
include/wx/msw/checkbox.h
View File

@@ -27,8 +27,8 @@ class WXDLLEXPORT wxCheckBox: public wxControl
DECLARE_DYNAMIC_CLASS(wxCheckBox)
public:
inline wxCheckBox(void) { }
inline wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label,
wxCheckBox() { }
wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
@@ -42,18 +42,20 @@ class WXDLLEXPORT wxCheckBox: public wxControl
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr);
virtual void SetValue(bool);
virtual bool GetValue(void) const ;
virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetValue(bool value);
virtual bool GetValue() const ;
virtual bool MSWCommand(WXUINT param, WXWORD id);
virtual void SetLabel(const wxString& label);
virtual void Command(wxCommandEvent& event);
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
protected:
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
};
class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
@@ -64,8 +66,8 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
int checkWidth ;
int checkHeight ;
inline wxBitmapCheckBox(void) { checkWidth = -1; checkHeight = -1; }
inline wxBitmapCheckBox(wxWindow *parent, wxWindowID id, const wxBitmap *label,
wxBitmapCheckBox() { checkWidth = -1; checkHeight = -1; }
wxBitmapCheckBox(wxWindow *parent, wxWindowID id, const wxBitmap *label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
@@ -79,14 +81,16 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr);
virtual void SetValue(bool);
virtual bool GetValue(void) const ;
virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetValue(bool value);
virtual bool GetValue() const ;
virtual void SetLabel(const wxBitmap& bitmap);
protected:
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
};
#endif
// _WX_CHECKBOX_H_

23
include/wx/msw/choice.h
View File

@@ -26,9 +26,9 @@ class WXDLLEXPORT wxChoice: public wxControl
DECLARE_DYNAMIC_CLASS(wxChoice)
public:
inline wxChoice(void) { m_noStrings = 0; }
wxChoice() { m_noStrings = 0; }
inline wxChoice(wxWindow *parent, wxWindowID id,
wxChoice(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
@@ -49,25 +49,21 @@ class WXDLLEXPORT wxChoice: public wxControl
virtual void Append(const wxString& item);
virtual void Delete(int n);
virtual void Clear(void);
virtual int GetSelection(void) const ;
virtual void Clear();
virtual int GetSelection() const ;
virtual void SetSelection(int n);
virtual int FindString(const wxString& s) const;
virtual wxString GetString(int n) const ;
virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual wxString GetStringSelection(void) const ;
virtual wxString GetStringSelection() const ;
virtual bool SetStringSelection(const wxString& sel);
virtual inline int Number(void) const { return m_noStrings; }
virtual int Number() const { return m_noStrings; }
virtual void Command(wxCommandEvent& event);
virtual bool MSWCommand(WXUINT param, WXWORD id);
virtual inline void SetColumns(int WXUNUSED(n) = 1 ) { /* No effect */ } ;
virtual inline int GetColumns(void) const { return 1 ; };
virtual void SetColumns(int WXUNUSED(n) = 1 ) { /* No effect */ }
virtual int GetColumns() const { return 1 ; }
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
@@ -77,6 +73,9 @@ class WXDLLEXPORT wxChoice: public wxControl
protected:
int m_noStrings;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
};
#endif

19
include/wx/msw/frame.h
View File

@@ -56,23 +56,9 @@ public:
virtual bool Destroy();
void SetClientSize(int width, int height);
void SetClientSize(const wxSize& sz) { wxWindow::SetClientSize(sz); }
void GetClientSize(int *width, int *height) const;
wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
void GetSize(int *width, int *height) const ;
wxSize GetSize() const { return wxWindow::GetSize(); }
void GetPosition(int *x, int *y) const ;
wxPoint GetPosition() const { return wxWindow::GetPosition(); }
virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
virtual void ClientToScreen(int *x, int *y) const;
@@ -208,6 +194,11 @@ protected:
WXHWND m_hwndToolTip;
#endif // tooltips
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
virtual void DoSetClientSize(int width, int height);
private:
DECLARE_EVENT_TABLE()
};

18
include/wx/msw/gauge95.h
View File

@@ -24,10 +24,11 @@ WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
class WXDLLEXPORT wxGauge95 : public wxControl
{
DECLARE_DYNAMIC_CLASS(wxGauge95)
public:
inline wxGauge95(void) { m_rangeMax = 0; m_gaugePos = 0; }
inline wxGauge95(wxWindow *parent, wxWindowID id,
public:
wxGauge95(void) { m_rangeMax = 0; m_gaugePos = 0; }
wxGauge95(wxWindow *parent, wxWindowID id,
int range,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@@ -61,19 +62,18 @@ class WXDLLEXPORT wxGauge95: public wxControl
// Backward compatibility
#if WXWIN_COMPATIBILITY
inline void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
#endif
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
protected:
int m_rangeMax;
int m_gaugePos;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
};
#endif

18
include/wx/msw/gaugemsw.h
View File

@@ -24,10 +24,11 @@ WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
class WXDLLEXPORT wxGaugeMSW: public wxControl
{
DECLARE_DYNAMIC_CLASS(wxGaugeMSW)
public:
inline wxGaugeMSW(void) { m_rangeMax = 0; m_gaugePos = 0; }
inline wxGaugeMSW(wxWindow *parent, wxWindowID id,
public:
wxGaugeMSW(void) { m_rangeMax = 0; m_gaugePos = 0; }
wxGaugeMSW(wxWindow *parent, wxWindowID id,
int range,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@@ -61,19 +62,18 @@ class WXDLLEXPORT wxGaugeMSW: public wxControl
// Backward compatibility
#if WXWIN_COMPATIBILITY
inline void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
#endif
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
protected:
int m_rangeMax;
int m_gaugePos;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
};
#endif

23
include/wx/msw/listbox.h
View File

@@ -43,10 +43,10 @@ WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
class WXDLLEXPORT wxListBox : public wxControl
{
DECLARE_DYNAMIC_CLASS(wxListBox)
public:
wxListBox(void);
inline wxListBox(wxWindow *parent, wxWindowID id,
public:
wxListBox();
wxListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
@@ -78,13 +78,13 @@ class WXDLLEXPORT wxListBox: public wxControl
// allows to get the item and use SetXXX functions to set it's appearance
wxOwnerDrawn *GetItem(size_t n) const { return m_aItems[n]; }
#endif
#endif // wxUSE_OWNER_DRAWN
virtual void Append(const wxString& item);
virtual void Append(const wxString& item, char *clientData);
virtual void Set(int n, const wxString* choices, char **clientData = NULL);
virtual int FindString(const wxString& s) const ;
virtual void Clear(void);
virtual void Clear();
virtual void SetSelection(int n, bool select = TRUE);
virtual void Deselect(int n);
@@ -100,10 +100,6 @@ class WXDLLEXPORT wxListBox: public wxControl
virtual int GetSelections(wxArrayInt& aSelections) const;
virtual bool Selected(int n) const ;
virtual wxString GetString(int n) const ;
virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
// Set the specified item at the first visible item
// or scroll to max range.
@@ -112,9 +108,9 @@ class WXDLLEXPORT wxListBox: public wxControl
virtual void InsertItems(int nItems, const wxString items[], int pos);
virtual wxString GetStringSelection(void) const ;
virtual wxString GetStringSelection() const ;
virtual bool SetStringSelection(const wxString& s, bool flag = TRUE);
virtual int Number(void) const ;
virtual int Number() const ;
void Command(wxCommandEvent& event);
@@ -128,7 +124,7 @@ class WXDLLEXPORT wxListBox: public wxControl
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
virtual void SetupColours(void);
virtual void SetupColours();
protected:
int m_noItems;
@@ -139,6 +135,9 @@ class WXDLLEXPORT wxListBox: public wxControl
wxListBoxItemsArray m_aItems;
#endif
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
};
#endif

6
include/wx/msw/private.h
View File

@@ -84,8 +84,8 @@ typedef signed short int SHORT ;
#endif
#if wxUSE_PENWIN
WXDLLEXPORT void wxRegisterPenWin(void);
WXDLLEXPORT void wxCleanUpPenWin(void);
WXDLLEXPORT void wxRegisterPenWin();
WXDLLEXPORT void wxCleanUpPenWin();
WXDLLEXPORT void wxEnablePenAppHooks (bool hook);
#endif
@@ -106,7 +106,7 @@ VOID WINAPI ibAdjustWindowRect( HWND hWnd, LPRECT lprc ) ;
* - NULL any extra child window pointers not created for this item
* (e.g. label control that wasn't needed)
* - delete any extra child windows in the destructor (e.g. label control)
* - implement GetSize and SetSize
* - implement DoSetSize
* - to find panel position if coordinates are (-1, -1), use GetPosition
* - call AdvanceCursor after creation, for panel layout mechanism.
*

41
include/wx/msw/radiobox.h
View File

@@ -26,8 +26,9 @@ class WXDLLEXPORT wxBitmap ;
class WXDLLEXPORT wxRadioBox : public wxControl
{
DECLARE_DYNAMIC_CLASS(wxRadioBox)
public:
wxRadioBox(void);
wxRadioBox();
#if WXWIN_COMPATIBILITY
wxRadioBox(wxWindow *parent, wxFunction func, const char *title,
@@ -46,10 +47,9 @@ public:
Callback(func);
}
*/
#endif // WXWIN_COMPATIBILITY
#endif
inline wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
int majorDim = 0, long style = wxRA_HORIZONTAL,
@@ -69,7 +69,7 @@ public:
}
*/
~wxRadioBox(void);
~wxRadioBox();
bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
@@ -91,43 +91,35 @@ public:
int FindString(const wxString& s) const;
void SetSelection(int N);
int GetSelection(void) const;
int GetSelection() const;
wxString GetString(int N) const;
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
void GetSize(int *x, int *y) const;
wxSize GetSize() const { return wxWindow::GetSize(); }
void GetPosition(int *x, int *y) const;
wxPoint GetPosition() const { return wxWindow::GetPosition(); }
wxString GetLabel(void) const;
wxString GetLabel() const;
void SetLabel(const wxString& label);
void SetLabel(int item, const wxString& label) ;
void SetLabel(int item, wxBitmap *bitmap) ;
wxString GetLabel(int item) const;
bool Show(bool show);
void SetFocus(void);
void SetFocus();
void Enable(bool enable);
void Enable(int item, bool enable);
void Show(int item, bool show) ;
inline void SetLabelFont(const wxFont& WXUNUSED(font)) {};
inline void SetButtonFont(const wxFont& font) { SetFont(font); }
void SetLabelFont(const wxFont& WXUNUSED(font)) {};
void SetButtonFont(const wxFont& font) { SetFont(font); }
virtual wxString GetStringSelection(void) const;
virtual wxString GetStringSelection() const;
virtual bool SetStringSelection(const wxString& s);
inline virtual int Number(void) const { return m_noItems; } ;
virtual int Number() const { return m_noItems; } ;
void Command(wxCommandEvent& event);
inline int GetNumberOfRowsOrCols(void) const { return m_noRowsOrCols; }
inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
// Implementation
inline WXHWND *GetRadioButtons(void) const { return m_radioButtons; }
WXHWND *GetRadioButtons() const { return m_radioButtons; }
bool ContainsHWND(WXHWND hWnd) const ;
long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
@@ -142,6 +134,9 @@ protected:
int m_noRowsOrCols;
int m_selectedButton;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
};
#endif

46
include/wx/msw/slider95.h
View File

@@ -26,9 +26,9 @@ class WXDLLEXPORT wxSlider95: public wxControl
DECLARE_DYNAMIC_CLASS(wxSlider95)
public:
wxSlider95(void);
wxSlider95();
inline wxSlider95(wxWindow *parent, wxWindowID id,
wxSlider95(wxWindow *parent, wxWindowID id,
int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@@ -39,7 +39,7 @@ public:
Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
}
~wxSlider95(void);
~wxSlider95();
bool Create(wxWindow *parent, wxWindowID id,
int value, int minValue, int maxValue,
@@ -49,47 +49,39 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSliderNameStr);
virtual int GetValue(void) const ;
virtual int GetValue() const ;
virtual void SetValue(int);
void GetSize(int *x, int *y) const ;
wxSize GetSize() const { return wxWindow::GetSize(); }
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
void GetPosition(int *x, int *y) const ;
wxPoint GetPosition() const { return wxWindow::GetPosition(); }
bool Show(bool show);
void SetRange(int minValue, int maxValue);
inline int GetMin(void) const { return m_rangeMin; }
inline int GetMax(void) const { return m_rangeMax; }
int GetMin() const { return m_rangeMin; }
int GetMax() const { return m_rangeMax; }
// For trackbars only
void SetTickFreq(int n, int pos);
inline int GetTickFreq(void) const { return m_tickFreq; }
int GetTickFreq() const { return m_tickFreq; }
void SetPageSize(int pageSize);
int GetPageSize(void) const ;
void ClearSel(void) ;
void ClearTicks(void) ;
int GetPageSize() const ;
void ClearSel() ;
void ClearTicks() ;
void SetLineSize(int lineSize);
int GetLineSize(void) const ;
int GetSelEnd(void) const ;
int GetSelStart(void) const ;
int GetLineSize() const ;
int GetSelEnd() const ;
int GetSelStart() const ;
void SetSelection(int minPos, int maxPos);
void SetThumbLength(int len) ;
int GetThumbLength(void) const ;
int GetThumbLength() const ;
void SetTick(int tickPos) ;
// IMPLEMENTATION
inline WXHWND GetStaticMin() const { return m_staticMin; }
inline WXHWND GetStaticMax() const { return m_staticMax; }
inline WXHWND GetEditValue() const { return m_staticValue; }
WXHWND GetStaticMin() const { return m_staticMin; }
WXHWND GetStaticMax() const { return m_staticMax; }
WXHWND GetEditValue() const { return m_staticValue; }
virtual bool ContainsHWND(WXHWND hWnd) const;
void Command(wxCommandEvent& event);
@@ -107,6 +99,10 @@ public:
int m_pageSize;
int m_lineSize;
int m_tickFreq;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
};
#endif

46
include/wx/msw/slidrmsw.h
View File

@@ -26,9 +26,9 @@ class WXDLLEXPORT wxSliderMSW: public wxControl
DECLARE_DYNAMIC_CLASS(wxSliderMSW)
public:
wxSliderMSW(void);
wxSliderMSW();
inline wxSliderMSW(wxWindow *parent, wxWindowID id,
wxSliderMSW(wxWindow *parent, wxWindowID id,
int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@@ -39,7 +39,7 @@ public:
Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
}
~wxSliderMSW(void);
~wxSliderMSW();
bool Create(wxWindow *parent, wxWindowID id,
int value, int minValue, int maxValue,
@@ -49,47 +49,39 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSliderNameStr);
virtual int GetValue(void) const ;
virtual int GetValue() const ;
virtual void SetValue(int);
void GetSize(int *x, int *y) const ;
wxSize GetSize() const { return wxWindow::GetSize(); }
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
void GetPosition(int *x, int *y) const ;
wxPoint GetPosition() const { return wxWindow::GetPosition(); }
bool Show(bool show);
void SetRange(int minValue, int maxValue);
inline int GetMin(void) const { return m_rangeMin; }
inline int GetMax(void) const { return m_rangeMax; }
int GetMin() const { return m_rangeMin; }
int GetMax() const { return m_rangeMax; }
// For trackbars only
void SetTickFreq(int n, int pos);
inline int GetTickFreq(void) const { return m_tickFreq; }
int GetTickFreq() const { return m_tickFreq; }
void SetPageSize(int pageSize);
int GetPageSize(void) const ;
void ClearSel(void) ;
void ClearTicks(void) ;
int GetPageSize() const ;
void ClearSel() ;
void ClearTicks() ;
void SetLineSize(int lineSize);
int GetLineSize(void) const ;
int GetSelEnd(void) const ;
int GetSelStart(void) const ;
int GetLineSize() const ;
int GetSelEnd() const ;
int GetSelStart() const ;
void SetSelection(int minPos, int maxPos);
void SetThumbLength(int len) ;
int GetThumbLength(void) const ;
int GetThumbLength() const ;
void SetTick(int tickPos) ;
// IMPLEMENTATION
inline WXHWND GetStaticMin() const { return m_staticMin; }
inline WXHWND GetStaticMax() const { return m_staticMax; }
inline WXHWND GetEditValue() const { return m_staticValue; }
WXHWND GetStaticMin() const { return m_staticMin; }
WXHWND GetStaticMax() const { return m_staticMax; }
WXHWND GetEditValue() const { return m_staticValue; }
virtual bool ContainsHWND(WXHWND hWnd) const;
void Command(wxCommandEvent& event);
@@ -107,6 +99,10 @@ public:
int m_pageSize;
int m_lineSize;
int m_tickFreq;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
};
#endif

9
include/wx/msw/statbmp.h
View File

@@ -49,12 +49,6 @@ public:
virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) { }
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size)
{ wxWindow::SetSize(size); }
wxBitmap& GetBitmap(void) const { return (wxBitmap&) m_messageBitmap; }
// overriden base class virtuals
@@ -67,6 +61,9 @@ public:
protected:
wxBitmap m_messageBitmap;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
};
#endif

10
include/wx/msw/statbox.h
View File

@@ -52,11 +52,6 @@ public:
virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size)
{ wxWindow::SetSize(size); }
void SetLabel(const wxString& label);
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
@@ -65,6 +60,11 @@ public:
// overriden base class virtuals
virtual bool AcceptsFocus() const { return FALSE; }
protected:
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
private:
DECLARE_EVENT_TABLE()
};

10
include/wx/msw/stattext.h
View File

@@ -45,11 +45,6 @@ public:
const wxString& name = wxStaticTextNameStr);
// accessors
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size)
{ wxWindow::SetSize(size); }
void SetLabel(const wxString& label);
// operations
@@ -63,6 +58,11 @@ public:
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
protected:
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
};
#endif

11
include/wx/msw/textctrl.h
View File

@@ -56,7 +56,7 @@ public:
// creation
// --------
wxTextCtrl();
inline wxTextCtrl(wxWindow *parent, wxWindowID id,
wxTextCtrl(wxWindow *parent, wxWindowID id,
const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
@@ -87,10 +87,6 @@ public:
// operations
// ----------
virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
// Clipboard operations
virtual void Copy();
@@ -167,6 +163,11 @@ protected:
wxString m_fileName;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
private:
DECLARE_EVENT_TABLE()
};

107
include/wx/msw/window.h
View File

@@ -198,43 +198,82 @@ public:
virtual int GetCharHeight() const;
virtual int GetCharWidth() const;
// Get overall window size
virtual void GetSize(int *width, int *height) const;
wxSize GetSize() const { int w, h; GetSize(& w, & h); return wxSize(w, h); }
// moving/resizing
// ---------------
// Get window position, relative to parent (or screen if no parent)
virtual void GetPosition(int *x, int *y) const;
wxPoint GetPosition() const
{ int x, y; GetPosition(&x, &y); return wxPoint(x, y); }
// set the window size and/or position
void SetSize( int x, int y, int width, int height,
int sizeFlags = wxSIZE_AUTO )
{ DoSetSize(x, y, width, height, sizeFlags); }
// Get size and position
wxRect GetRect() const
{ int x, y, w, h; GetPosition(& x, & y); GetSize(& w, & h); return wxRect(x, y, w, h); }
void SetSize( int width, int height )
{ DoSetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
// Get client (application-useable) size
virtual void GetClientSize(int *width, int *height) const;
wxSize GetClientSize() const { int w, h; GetClientSize(& w, & h); return wxSize(w, h); }
// Set overall size and position
// generic function, may be overriden in derived classes
virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize( const wxSize& size )
{ SetSize(size.x, size.y); }
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ SetSize(rect.x, rect.y, rect.width, rect.height, sizeFlags); }
{ DoSetSize(rect.x, rect.y, rect.width, rect.height, sizeFlags); }
// set size only
void SetSize(int width, int height)
{ SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
void SetSize(const wxSize& size)
{ SetSize(-1, -1, size.x, size.y, wxSIZE_USE_EXISTING); }
void Move( int x, int y )
{ DoSetSize( x, y, -1, -1, wxSIZE_USE_EXISTING ); }
// set position only
virtual void Move(int x, int y) { SetSize(x, y, -1, -1, wxSIZE_USE_EXISTING); }
void Move(const wxPoint& pt) { SetSize(pt.x, pt.y, -1, -1, wxSIZE_USE_EXISTING); }
void Move(const wxPoint& pt)
{ Move(pt.x, pt.y); }
// Set client size
virtual void SetClientSize(int width, int height);
void SetClientSize(const wxSize& sz) { SetClientSize(sz.x, sz.y); }
// client size is the size of area available for subwindows
void SetClientSize( int width, int height )
{ DoSetClientSize(width, height); }
void SetClientSize( const wxSize& size )
{ DoSetClientSize(size.x, size.y); }
void SetClientSize(const wxRect& rect)
{ SetClientSize( rect.width, rect.height ); }
// get the window position and/or size
virtual void GetPosition( int *x, int *y ) const;
wxPoint GetPosition() const
{
int w, h;
GetPosition(& w, & h);
return wxPoint(w, h);
}
virtual void GetSize( int *width, int *height ) const;
wxSize GetSize() const
{
int w, h;
GetSize(& w, & h);
return wxSize(w, h);
}
wxRect GetRect() const
{
int x, y, w, h;
GetPosition(& x, & y);
GetSize(& w, & h);
return wxRect(x, y, w, h);
}
virtual void GetClientSize( int *width, int *height ) const;
wxSize GetClientSize() const
{
int w, h;
GetClientSize(& w, & h);
return wxSize(w, h);
}
wxRect GetClientRect() const
{
int w, h;
GetSize(& w, & h);
return wxRect(0, 0, w, h);
}
// Convert client to screen coordinates
virtual void ClientToScreen(int *x, int *y) const;
@@ -764,6 +803,16 @@ public:
bool m_isBeingDeleted; // Fudge because can't access parent
// when being deleted
// this is the virtual function to be overriden in any derived class which
// wants to change how SetSize() or Move() works - it is called by all
// versions of these functions in the base class
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
// same as DoSetSize() for the client size
virtual void DoSetClientSize(int width, int height);
private:
// common part of all ctors
void Init();

1
src/common/ftp.cpp
View File

@@ -328,7 +328,6 @@ bool wxFTP::Abort(void)
wxInputStream *wxFTP::GetInputStream(const wxString& path)
{
wxString tmp_str;
size_t calc_size;
if (!SendCommand("TYPE I", '2'))
return NULL;

7
src/common/layout.cpp
View File

@@ -1273,7 +1273,7 @@ void wxSizer::RemoveSizerChild(wxWindow *child)
GetChildren().DeleteObject(child);
}
void wxSizer::SetSize(int x, int y, int w, int h, int WXUNUSED(flags))
void wxSizer::DoSetSize(int x, int y, int w, int h, int WXUNUSED(flags))
{
wxLayoutConstraints *constr = GetConstraints();
if (x != -1)
@@ -1500,11 +1500,6 @@ wxRowColSizer::~wxRowColSizer()
{
}
void wxRowColSizer::SetSize(int x, int y, int w, int h, int flags)
{
wxSizer::SetSize(x, y, w, h, flags);
}
bool wxRowColSizer::LayoutPhase1(int *noChanges)
{
*noChanges = 0;

8
src/common/log.cpp
View File

@@ -994,10 +994,10 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
// make life easier for people using VC++ IDE: clicking on the message will
// take us immediately to the place of the failed assert
#ifdef __VISUALC__
sprintf(szBuf, _("%s(%d): assert failed"), szFile, nLine);
sprintf(szBuf, "%s(%d): assert failed", szFile, nLine);
#else // !VC++
// make the error message more clear for all the others
sprintf(szBuf, _("Assert failed in file %s at line %d"), szFile, nLine);
sprintf(szBuf, "Assert failed in file %s at line %d", szFile, nLine);
#endif // VC/!VC
if ( szMsg != NULL ) {
@@ -1015,9 +1015,9 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
#if wxUSE_NOGUI
Trap();
#else
strcat(szBuf, _("\nDo you want to stop the program?"
strcat(szBuf, "\nDo you want to stop the program?"
"\nYou can also choose [Cancel] to suppress "
"further warnings."));
"further warnings.");
switch ( wxMessageBox(szBuf, _("Debug"),
wxYES_NO | wxCANCEL | wxICON_STOP ) ) {

2
src/common/object.cpp
View File

@@ -320,7 +320,7 @@ void wxObject::LoadObject( wxObjectInputStream& stream )
m_serialObj->LoadObject(stream);
}
#endif
#endif // wxUSE_SERIAL
/*
* wxObject: cloning of objects

1
src/common/valgen.cpp
View File

@@ -24,6 +24,7 @@
#include "wx/utils.h"
#include "wx/intl.h"
#include "wx/wx.h"
#include "wx/dynarray.h"
#endif
#ifndef __WIN16__

7
src/gtk/dialog.cpp
View File

@@ -290,7 +290,7 @@ void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
}
}
void wxDialog::SetSize( int x, int y, int width, int height, int sizeFlags )
void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{
wxASSERT_MSG( (m_widget != NULL), "invalid dialog" );
wxASSERT_MSG( (m_wxwindow != NULL), "invalid dialog" );
@@ -350,11 +350,6 @@ void wxDialog::SetSize( int x, int y, int width, int height, int sizeFlags )
m_resizing = FALSE;
}
void wxDialog::SetSize( int width, int height )
{
SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING );
}
void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
{
// due to a bug in gtk, x,y are always 0

17
src/gtk/filedlg.cpp
View File

@@ -46,11 +46,11 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dial
{
int style = dialog->GetStyle();
GtkFileSelection *filedlg = GTK_FILE_SELECTION(dialog->m_widget);
char *filename = gtk_file_selection_get_filename(filedlg);
if ( (style & wxSAVE) && ( style & wxOVERWRITE_PROMPT ) )
{
char *filename = gtk_file_selection_get_filename(
GTK_FILE_SELECTION(dialog->m_widget) );
if (wxFileExists( filename ))
{
wxString msg;
@@ -61,8 +61,17 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dial
return;
}
}
else if ( (style & wxOPEN) && ( style & wxFILE_MUST_EXIST) )
{
if ( !wxFileExists( filename ) )
{
wxMessageBox(_("Please choose an existing file."), _("Error"), wxOK);
dialog->SetPath( gtk_file_selection_get_filename( GTK_FILE_SELECTION(dialog->m_widget) ) );
return;
}
}
dialog->SetPath( filename );
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
event.SetEventObject( dialog );

9
src/gtk/frame.cpp
View File

@@ -249,7 +249,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
return pt;
}
void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{
wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
@@ -312,11 +312,6 @@ void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
m_resizing = FALSE;
}
void wxFrame::SetSize( int width, int height )
{
SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING );
}
void wxFrame::Centre( int direction )
{
wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
@@ -353,7 +348,7 @@ void wxFrame::GetClientSize( int *width, int *height ) const
}
}
void wxFrame::SetClientSize( int width, int height )
void wxFrame::DoSetClientSize( int width, int height )
{
wxASSERT_MSG( (m_widget != NULL), "invalid frame" );

17
src/gtk/window.cpp
View File

@@ -21,12 +21,15 @@
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/msgdlg.h"
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
#endif
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#endif
#include "wx/menu.h"
#include "wx/statusbr.h"
#include "wx/intl.h"
@@ -1798,7 +1801,7 @@ void wxWindow::AdjustForParentClientOrigin( int& x, int& y, int sizeFlags )
}
}
void wxWindow::SetSize( int x, int y, int width, int height, int sizeFlags )
void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
wxASSERT_MSG( (m_parent != NULL), "wxWindow::SetSize requires parent.\n" );
@@ -1883,16 +1886,6 @@ void wxWindow::OnInternalIdle()
UpdateWindowUI();
}
void wxWindow::SetSize( int width, int height )
{
SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING );
}
void wxWindow::Move( int x, int y )
{
SetSize( x, y, -1, -1, wxSIZE_USE_EXISTING );
}
void wxWindow::GetSize( int *width, int *height ) const
{
wxCHECK_RET( (m_widget != NULL), "invalid window" );
@@ -1901,7 +1894,7 @@ void wxWindow::GetSize( int *width, int *height ) const
if (height) (*height) = m_height;
}
void wxWindow::SetClientSize( int width, int height )
void wxWindow::DoSetClientSize( int width, int height )
{
wxCHECK_RET( (m_widget != NULL), "invalid window" );

7
src/gtk1/dialog.cpp
View File

@@ -290,7 +290,7 @@ void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
}
}
void wxDialog::SetSize( int x, int y, int width, int height, int sizeFlags )
void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{
wxASSERT_MSG( (m_widget != NULL), "invalid dialog" );
wxASSERT_MSG( (m_wxwindow != NULL), "invalid dialog" );
@@ -350,11 +350,6 @@ void wxDialog::SetSize( int x, int y, int width, int height, int sizeFlags )
m_resizing = FALSE;
}
void wxDialog::SetSize( int width, int height )
{
SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING );
}
void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
{
// due to a bug in gtk, x,y are always 0

17
src/gtk1/filedlg.cpp
View File

@@ -46,11 +46,11 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dial
{
int style = dialog->GetStyle();
GtkFileSelection *filedlg = GTK_FILE_SELECTION(dialog->m_widget);
char *filename = gtk_file_selection_get_filename(filedlg);
if ( (style & wxSAVE) && ( style & wxOVERWRITE_PROMPT ) )
{
char *filename = gtk_file_selection_get_filename(
GTK_FILE_SELECTION(dialog->m_widget) );
if (wxFileExists( filename ))
{
wxString msg;
@@ -61,8 +61,17 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dial
return;
}
}
else if ( (style & wxOPEN) && ( style & wxFILE_MUST_EXIST) )
{
if ( !wxFileExists( filename ) )
{
wxMessageBox(_("Please choose an existing file."), _("Error"), wxOK);
dialog->SetPath( gtk_file_selection_get_filename( GTK_FILE_SELECTION(dialog->m_widget) ) );
return;
}
}
dialog->SetPath( filename );
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
event.SetEventObject( dialog );

9
src/gtk1/frame.cpp
View File

@@ -249,7 +249,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
return pt;
}
void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{
wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
@@ -312,11 +312,6 @@ void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
m_resizing = FALSE;
}
void wxFrame::SetSize( int width, int height )
{
SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING );
}
void wxFrame::Centre( int direction )
{
wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
@@ -353,7 +348,7 @@ void wxFrame::GetClientSize( int *width, int *height ) const
}
}
void wxFrame::SetClientSize( int width, int height )
void wxFrame::DoSetClientSize( int width, int height )
{
wxASSERT_MSG( (m_widget != NULL), "invalid frame" );

17
src/gtk1/window.cpp
View File

@@ -21,12 +21,15 @@
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/msgdlg.h"
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
#endif
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#endif
#include "wx/menu.h"
#include "wx/statusbr.h"
#include "wx/intl.h"
@@ -1798,7 +1801,7 @@ void wxWindow::AdjustForParentClientOrigin( int& x, int& y, int sizeFlags )
}
}
void wxWindow::SetSize( int x, int y, int width, int height, int sizeFlags )
void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
wxASSERT_MSG( (m_parent != NULL), "wxWindow::SetSize requires parent.\n" );
@@ -1883,16 +1886,6 @@ void wxWindow::OnInternalIdle()
UpdateWindowUI();
}
void wxWindow::SetSize( int width, int height )
{
SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING );
}
void wxWindow::Move( int x, int y )
{
SetSize( x, y, -1, -1, wxSIZE_USE_EXISTING );
}
void wxWindow::GetSize( int *width, int *height ) const
{
wxCHECK_RET( (m_widget != NULL), "invalid window" );
@@ -1901,7 +1894,7 @@ void wxWindow::GetSize( int *width, int *height ) const
if (height) (*height) = m_height;
}
void wxWindow::SetClientSize( int width, int height )
void wxWindow::DoSetClientSize( int width, int height )
{
wxCHECK_RET( (m_widget != NULL), "invalid window" );

2
src/motif/checkbox.cpp
View File

@@ -123,7 +123,7 @@ void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap)
// TODO
}
void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxBitmapCheckBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
// TODO
}

4
src/motif/choice.cpp
View File

@@ -349,7 +349,7 @@ void wxChoice::SetFocus()
XmProcessTraversal(XtParent((Widget)m_mainWidget), XmTRAVERSE_CURRENT);
}
void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_ANY, NULL);
bool managed = XtIsManaged((Widget) m_formWidget);
@@ -380,7 +380,7 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
XtManageChild ((Widget) m_formWidget);
XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
wxControl::SetSize (x, y, width, height, sizeFlags);
wxControl::DoSetSize (x, y, width, height, sizeFlags);
}
wxString wxChoice::GetStringSelection () const

4
src/motif/combobox.cpp
View File

@@ -102,10 +102,10 @@ wxComboBox::~wxComboBox()
m_mainWidget = (WXWidget) 0;
}
void wxComboBox::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxComboBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
// Necessary so it doesn't call wxChoice::SetSize
wxWindow::SetSize(x, y, width, height, sizeFlags);
wxWindow::DoSetSize(x, y, width, height, sizeFlags);
}
wxString wxComboBox::GetValue() const

10
src/motif/dialog.cpp
View File

@@ -335,19 +335,13 @@ XtVaGetValues((Widget) m_mainWidget, XmNiconic, &iconic, NULL);
return FALSE;
}
void wxDialog::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
XtVaSetValues((Widget) m_mainWidget, XmNresizePolicy, XmRESIZE_ANY, NULL);
wxWindow::SetSize(x, y, width, height, sizeFlags);
wxWindow::DoSetSize(x, y, width, height, sizeFlags);
XtVaSetValues((Widget) m_mainWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
}
void wxDialog::SetClientSize(int width, int height)
{
SetSize(-1, -1, width, height);
}
void wxDialog::SetTitle(const wxString& title)
{
m_dialogTitle = title;

4
src/motif/frame.cpp
View File

@@ -412,7 +412,7 @@ void wxFrame::GetClientSize(int *x, int *y) const
// Set the client size (i.e. leave the calculation of borders etc.
// to wxWindows)
void wxFrame::SetClientSize(int width, int height)
void wxFrame::DoSetClientSize(int width, int height)
{
// Calculate how large the new main window should be
// by finding the difference between the client area and the
@@ -480,7 +480,7 @@ void wxFrame::GetPosition(int *x, int *y) const
if (y) *y = yy;
}
void wxFrame::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
if (x > -1)
XtVaSetValues((Widget) m_frameShell, XmNx, x, NULL);

5
src/motif/gauge.cpp
View File

@@ -134,11 +134,6 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
return TRUE;
}
void wxGauge::SetSize(int x, int y, int width, int height, int sizeFlags)
{
wxControl::SetSize(x, y, width, height, sizeFlags);
}
void wxGauge::SetShadowWidth(int w)
{
if (w == 0)

4
src/motif/listbox.cpp
View File

@@ -512,9 +512,9 @@ wxString wxListBox::GetString(int N) const
return wxEmptyString;
}
void wxListBox::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxListBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
wxWindow::SetSize(x, y, width, height, sizeFlags);
wxWindow::DoSetSize(x, y, width, height, sizeFlags);
// Check resulting size is correct
int tempW, tempH;

20
src/motif/mdi.cpp
View File

@@ -109,12 +109,6 @@ wxMDIParentFrame::~wxMDIParentFrame()
m_clientWindow = NULL;
}
// Get size *available for subwindows* i.e. excluding menu bar.
void wxMDIParentFrame::GetClientSize(int *x, int *y) const
{
wxFrame::GetClientSize(x, y);
}
void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
{
m_frameMenuBar = menu_bar;
@@ -438,7 +432,7 @@ void wxMDIChildFrame::OnLower()
// to wxWindows)
void wxMDIChildFrame::SetClientSize(int width, int height)
{
wxWindow::SetClientSize(width, height);
wxWindow::DoSetClientSize(width, height);
}
void wxMDIChildFrame::GetClientSize(int* width, int* height) const
@@ -446,9 +440,9 @@ void wxMDIChildFrame::GetClientSize(int* width, int* height) const
wxWindow::GetSize(width, height);
}
void wxMDIChildFrame::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxMDIChildFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
wxWindow::SetSize(x, y, width, height, sizeFlags);
wxWindow::DoSetSize(x, y, width, height, sizeFlags);
}
void wxMDIChildFrame::GetSize(int* width, int* height) const
@@ -590,14 +584,14 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
return FALSE;
}
void wxMDIClientWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
wxWindow::SetSize(x, y, width, height, sizeFlags);
wxWindow::DoSetSize(x, y, width, height, sizeFlags);
}
void wxMDIClientWindow::SetClientSize(int width, int height)
void wxMDIClientWindow::DoSetClientSize(int width, int height)
{
wxWindow::SetClientSize(width, height);
wxWindow::DoSetClientSize(width, height);
}
void wxMDIClientWindow::GetClientSize(int *width, int *height) const

2
src/motif/radiobox.cpp
View File

@@ -297,7 +297,7 @@ wxString wxRadioBox::GetString(int n) const
return m_radioButtonLabels[n];
}
void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
bool managed = XtIsManaged((Widget) m_formWidget);

2
src/motif/slider.cpp
View File

@@ -131,7 +131,7 @@ void wxSlider::GetSize(int *width, int *height) const
wxControl::GetSize(width, height);
}
void wxSlider::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxSlider::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
Widget widget = (Widget) m_mainWidget;

5
src/motif/statbmp.cpp
View File

@@ -82,11 +82,6 @@ wxStaticBitmap::~wxStaticBitmap()
SetBitmap(wxNullBitmap);
}
void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
{
wxControl::SetSize(x, y, width, height, sizeFlags);
}
void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
{
m_messageBitmap = bitmap;

4
src/motif/statbox.cpp
View File

@@ -182,9 +182,9 @@ wxString wxStaticBox::GetLabel() const
}
}
void wxStaticBox::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxStaticBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
wxControl::SetSize (x, y, width, height, sizeFlags);
wxControl::DoSetSize (x, y, width, height, sizeFlags);
if (m_labelWidget)
{

2
src/msw/button.cpp
View File

@@ -96,7 +96,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
return TRUE;
}
void wxButton::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxButton::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(&currentX, &currentY);

8
src/msw/checkbox.cpp
View File

@@ -118,7 +118,7 @@ void wxCheckBox::SetLabel(const wxString& label)
SetWindowText((HWND)GetHWND(), label);
}
void wxCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxCheckBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(&currentX, &currentY);
@@ -174,7 +174,7 @@ void wxCheckBox::SetValue(bool val)
#define BST_CHECKED 0x0001
#endif
bool wxCheckBox::GetValue(void) const
bool wxCheckBox::GetValue() const
{
#ifdef __WIN32__
return (SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0) == BST_CHECKED);
@@ -275,7 +275,7 @@ void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap)
{
}
void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxBitmapCheckBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(&currentX, &currentY);
@@ -307,7 +307,7 @@ void wxBitmapCheckBox::SetValue(bool val)
SendMessage((HWND) GetHWND(), BM_SETCHECK, val, 0);
}
bool wxBitmapCheckBox::GetValue(void) const
bool wxBitmapCheckBox::GetValue() const
{
return ((0x003 & SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0)) == 0x003);
}

2
src/msw/choice.cpp
View File

@@ -180,7 +180,7 @@ wxString wxChoice::GetString(int n) const
return wxString(wxBuffer);
}
void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(&currentX, &currentY);

32
src/msw/frame.cpp
View File

@@ -68,7 +68,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
bool wxFrame::m_useNativeStatusBar = FALSE;
#endif
wxFrame::wxFrame(void)
wxFrame::wxFrame()
{
m_frameToolBar = NULL ;
m_frameMenuBar = NULL;
@@ -126,7 +126,7 @@ bool wxFrame::Create(wxWindow *parent,
return TRUE;
}
wxFrame::~wxFrame(void)
wxFrame::~wxFrame()
{
m_isBeingDeleted = TRUE;
wxTopLevelWindows.DeleteObject(this);
@@ -158,7 +158,7 @@ wxFrame::~wxFrame(void)
::BringWindowToTop((HWND) GetParent()->GetHWND());
}
WXHMENU wxFrame::GetWinMenu(void) const
WXHMENU wxFrame::GetWinMenu() const
{
return m_hMenu;
}
@@ -186,7 +186,7 @@ void wxFrame::GetClientSize(int *x, int *y) const
// Set the client size (i.e. leave the calculation of borders etc.
// to wxWindows)
void wxFrame::SetClientSize(int width, int height)
void wxFrame::DoSetClientSize(int width, int height)
{
HWND hWnd = (HWND) GetHWND();
@@ -244,7 +244,7 @@ void wxFrame::GetPosition(int *x, int *y) const
*y = point.y;
}
void wxFrame::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
int x1 = x;
@@ -329,14 +329,14 @@ void wxFrame::Maximize(bool maximize)
m_iconized = FALSE;
}
bool wxFrame::IsIconized(void) const
bool wxFrame::IsIconized() const
{
((wxFrame *)this)->m_iconized = (::IsIconic((HWND) GetHWND()) != 0);
return m_iconized;
}
// Is it maximized?
bool wxFrame::IsMaximized(void) const
bool wxFrame::IsMaximized() const
{
return (::IsZoomed((HWND) GetHWND()) != 0) ;
}
@@ -346,7 +346,7 @@ void wxFrame::SetTitle(const wxString& title)
SetWindowText((HWND) GetHWND(), (const char *)title);
}
wxString wxFrame::GetTitle(void) const
wxString wxFrame::GetTitle() const
{
GetWindowText((HWND) GetHWND(), wxBuffer, 1000);
return wxString(wxBuffer);
@@ -427,7 +427,7 @@ void wxFrame::SetStatusWidths(int n, const int widths_field[])
PositionStatusBar();
}
void wxFrame::PositionStatusBar(void)
void wxFrame::PositionStatusBar()
{
// native status bar positions itself
if (m_frameStatusBar
@@ -515,7 +515,7 @@ bool wxFrame::LoadAccelerators(const wxString& table)
}
#endif
void wxFrame::Fit(void)
void wxFrame::Fit()
{
// Work out max. size
wxNode *node = GetChildren().First();
@@ -633,7 +633,7 @@ void wxFrame::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow *
::PostMessage((HWND) GetHWND(), WM_SIZE, SIZE_RESTORED, MAKELPARAM(width, height));
}
bool wxFrame::MSWOnPaint(void)
bool wxFrame::MSWOnPaint()
{
RECT rect;
if (GetUpdateRect((HWND) GetHWND(), &rect, FALSE))
@@ -679,7 +679,7 @@ bool wxFrame::MSWOnPaint(void)
return 1;
}
WXHICON wxFrame::MSWOnQueryDragIcon(void)
WXHICON wxFrame::MSWOnQueryDragIcon()
{
if (m_icon.Ok() && (m_icon.GetHICON() != 0))
return m_icon.GetHICON();
@@ -738,7 +738,7 @@ void wxFrame::MSWOnSize(int x, int y, WXUINT id)
}
}
bool wxFrame::MSWOnClose(void)
bool wxFrame::MSWOnClose()
{
return Close();
}
@@ -866,7 +866,7 @@ void wxFrame::OnCloseWindow(wxCloseEvent& event)
}
// Destroy the window (delayed, if a managed window)
bool wxFrame::Destroy(void)
bool wxFrame::Destroy()
{
if (!wxPendingDelete.Member(this))
wxPendingDelete.Append(this);
@@ -898,7 +898,7 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
}
}
wxMenuBar *wxFrame::GetMenuBar(void) const
wxMenuBar *wxFrame::GetMenuBar() const
{
return m_frameMenuBar;
}
@@ -1011,7 +1011,7 @@ wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& n
return new wxToolBar(this, id, wxDefaultPosition, wxDefaultSize, style, name);
}
void wxFrame::PositionToolBar(void)
void wxFrame::PositionToolBar()
{
RECT rect;
::GetClientRect((HWND) GetHWND(), &rect);

2
src/msw/gauge95.cpp
View File

@@ -94,7 +94,7 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
return TRUE;
}
void wxGauge95::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxGauge95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(&currentX, &currentY);

2
src/msw/gaugemsw.cpp
View File

@@ -142,7 +142,7 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
return TRUE;
}
void wxGaugeMSW::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxGaugeMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(&currentX, &currentY);

14
src/msw/listbox.cpp
View File

@@ -140,7 +140,7 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
}
// Listbox item
wxListBox::wxListBox(void)
wxListBox::wxListBox()
{
m_noItems = 0;
m_selected = 0;
@@ -258,7 +258,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
return TRUE;
}
wxListBox::~wxListBox(void)
wxListBox::~wxListBox()
{
#if wxUSE_OWNER_DRAWN
size_t uiCount = m_aItems.Count();
@@ -268,7 +268,7 @@ wxListBox::~wxListBox(void)
#endif
}
void wxListBox::SetupColours(void)
void wxListBox::SetupColours()
{
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
SetForegroundColour(GetParent()->GetForegroundColour());
@@ -377,7 +377,7 @@ int wxListBox::FindString(const wxString& s) const
return pos;
}
void wxListBox::Clear(void)
void wxListBox::Clear()
{
ListBox_ResetContent(hwnd);
@@ -474,7 +474,7 @@ wxString wxListBox::GetString(int N) const
return wxString(wxBuffer);
}
void wxListBox::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxListBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(&currentX, &currentY);
@@ -640,13 +640,13 @@ void wxListBox::SetString(int N, const wxString& s)
#endif //USE_OWNER_DRAWN
}
int wxListBox::Number (void) const
int wxListBox::Number () const
{
return m_noItems;
}
// For single selection items only
wxString wxListBox::GetStringSelection (void) const
wxString wxListBox::GetStringSelection () const
{
int sel = GetSelection ();
if (sel > -1)

2
src/msw/radiobox.cpp
View File

@@ -569,7 +569,7 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
#endif
// Restored old code.
void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(&currentX, &currentY);

22
src/msw/slider95.cpp
View File

@@ -40,7 +40,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl)
#endif
// Slider
wxSlider95::wxSlider95(void)
wxSlider95::wxSlider95()
{
m_staticValue = 0;
m_staticMin = 0;
@@ -264,7 +264,7 @@ void wxSlider95::MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control)
MSWOnVScroll(wParam, pos, control);
}
wxSlider95::~wxSlider95(void)
wxSlider95::~wxSlider95()
{
if (m_staticMin)
DestroyWindow((HWND) m_staticMin);
@@ -274,7 +274,7 @@ wxSlider95::~wxSlider95(void)
DestroyWindow((HWND) m_staticValue);
}
int wxSlider95::GetValue(void) const
int wxSlider95::GetValue() const
{
return ::SendMessage((HWND) GetHWND(), TBM_GETPOS, 0, 0);
}
@@ -343,7 +343,7 @@ void wxSlider95::GetPosition(int *x, int *y) const
*y = point.y;
}
void wxSlider95::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int x1 = x;
int y1 = y;
@@ -553,17 +553,17 @@ void wxSlider95::SetPageSize(int pageSize)
m_pageSize = pageSize;
}
int wxSlider95::GetPageSize(void) const
int wxSlider95::GetPageSize() const
{
return m_pageSize;
}
void wxSlider95::ClearSel(void)
void wxSlider95::ClearSel()
{
::SendMessage( (HWND) GetHWND(), TBM_CLEARSEL, (WPARAM) TRUE, (LPARAM) 0 );
}
void wxSlider95::ClearTicks(void)
void wxSlider95::ClearTicks()
{
::SendMessage( (HWND) GetHWND(), TBM_CLEARTICS, (WPARAM) TRUE, (LPARAM) 0 );
}
@@ -574,17 +574,17 @@ void wxSlider95::SetLineSize(int lineSize)
::SendMessage( (HWND) GetHWND(), TBM_SETLINESIZE, (WPARAM) 0, (LPARAM) lineSize );
}
int wxSlider95::GetLineSize(void) const
int wxSlider95::GetLineSize() const
{
return (int) ::SendMessage( (HWND) GetHWND(), TBM_GETLINESIZE, (WPARAM) 0, (LPARAM) 0 );
}
int wxSlider95::GetSelEnd(void) const
int wxSlider95::GetSelEnd() const
{
return (int) ::SendMessage( (HWND) GetHWND(), TBM_SETSELEND, (WPARAM) 0, (LPARAM) 0 );
}
int wxSlider95::GetSelStart(void) const
int wxSlider95::GetSelStart() const
{
return (int) ::SendMessage( (HWND) GetHWND(), TBM_GETSELSTART, (WPARAM) 0, (LPARAM) 0 );
}
@@ -599,7 +599,7 @@ void wxSlider95::SetThumbLength(int len)
::SendMessage( (HWND) GetHWND(), TBM_SETTHUMBLENGTH, (WPARAM) len, (LPARAM) 0 );
}
int wxSlider95::GetThumbLength(void) const
int wxSlider95::GetThumbLength() const
{
return (int) ::SendMessage( (HWND) GetHWND(), TBM_GETTHUMBLENGTH, (WPARAM) 0, (LPARAM) 0 );
}

22
src/msw/slidrmsw.cpp
View File

@@ -34,7 +34,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxSliderMSW, wxControl)
#endif
// Slider
wxSliderMSW::wxSliderMSW(void)
wxSliderMSW::wxSliderMSW()
{
m_staticValue = 0;
m_staticMin = 0;
@@ -235,7 +235,7 @@ void wxSliderMSW::MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control)
MSWOnVScroll(wParam, pos, control);
}
wxSliderMSW::~wxSliderMSW(void)
wxSliderMSW::~wxSliderMSW()
{
if (m_staticMin)
DestroyWindow((HWND) m_staticMin);
@@ -245,7 +245,7 @@ wxSliderMSW::~wxSliderMSW(void)
DestroyWindow((HWND) m_staticValue);
}
int wxSliderMSW::GetValue(void) const
int wxSliderMSW::GetValue() const
{
return ::GetScrollPos((HWND) GetHWND(), SB_CTL);
}
@@ -314,7 +314,7 @@ void wxSliderMSW::GetPosition(int *x, int *y) const
*y = point.y;
}
void wxSliderMSW::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int x1 = x;
int y1 = y;
@@ -501,16 +501,16 @@ void wxSliderMSW::SetPageSize(int pageSize)
m_pageSize = pageSize;
}
int wxSliderMSW::GetPageSize(void) const
int wxSliderMSW::GetPageSize() const
{
return m_pageSize;
}
void wxSliderMSW::ClearSel(void)
void wxSliderMSW::ClearSel()
{
}
void wxSliderMSW::ClearTicks(void)
void wxSliderMSW::ClearTicks()
{
}
@@ -519,17 +519,17 @@ void wxSliderMSW::SetLineSize(int lineSize)
m_lineSize = lineSize;
}
int wxSliderMSW::GetLineSize(void) const
int wxSliderMSW::GetLineSize() const
{
return m_lineSize;
}
int wxSliderMSW::GetSelEnd(void) const
int wxSliderMSW::GetSelEnd() const
{
return 0;
}
int wxSliderMSW::GetSelStart(void) const
int wxSliderMSW::GetSelStart() const
{
return 0;
}
@@ -542,7 +542,7 @@ void wxSliderMSW::SetThumbLength(int len)
{
}
int wxSliderMSW::GetThumbLength(void) const
int wxSliderMSW::GetThumbLength() const
{
return 0;
}

2
src/msw/statbmp.cpp
View File

@@ -90,7 +90,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
return TRUE;
}
void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxStaticBitmap::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(&currentX, &currentY);

2
src/msw/statbox.cpp
View File

@@ -102,7 +102,7 @@ void wxStaticBox::SetLabel(const wxString& label)
SetWindowText((HWND)m_hWnd, (const char *)label);
}
void wxStaticBox::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxStaticBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(&currentX, &currentY);

2
src/msw/stattext.cpp
View File

@@ -94,7 +94,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
return TRUE;
}
void wxStaticText::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxStaticText::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(&currentX, &currentY);

2
src/msw/textctrl.cpp
View File

@@ -311,7 +311,7 @@ void wxTextCtrl::SetValue(const wxString& value)
SetWindowText((HWND) GetHWND(), (const char *)value);
}
void wxTextCtrl::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxTextCtrl::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(&currentX, &currentY);