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

More border rationalisation. GetDefaultBorder is now mostly defined in base class files.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-11-13 12:10:34 +00:00
parent fba05595e6
commit dc797d8e1b
31 changed files with 104 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,6 +86,9 @@ public:
virtual bool CanApplyThemeBorder() const { return false; }
protected:
// choose the default border for this window
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
// common part of all ctors
void Init() { m_lastAcceptedSelection = wxID_NONE; }

1
include/wx/msw/datectrl.h
View File

@@ -61,6 +61,7 @@ public:
virtual bool CanApplyThemeBorder() const { return false; }
protected:
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
virtual wxSize DoGetBestSize() const;
// the date currently shown by the control, may be invalid

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

@@ -116,9 +116,6 @@ protected:
virtual void DoMoveWindow(int x, int y, int width, int height);
virtual wxSize DoGetBestSize() const;
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
// the labels windows, if any
wxSubwindows *m_labels;

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

@@ -58,7 +58,6 @@ public:
virtual bool CanApplyThemeBorder() const { return false; }
protected:
virtual wxBorder GetDefaultBorder() const;
virtual wxSize DoGetBestSize() const;
// ctor/dtor helpers

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

@@ -46,9 +46,6 @@ public:
protected:
virtual wxSize DoGetBestSize() const;
// choose the default border for this window
virtual wxBorder GetDefaultBorder() const;
#ifndef __WXWINCE__
public:
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

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

@@ -44,7 +44,6 @@ public:
protected:
// implement/override some base class virtuals
virtual wxBorder GetDefaultBorder() const;
virtual void DoSetSize(int x, int y, int w, int h,
int sizeFlags = wxSIZE_AUTO);
virtual wxSize DoGetBestSize() const;

2
include/wx/msw/tglbtn.h
View File

@@ -52,8 +52,8 @@ public:
virtual bool CanApplyThemeBorder() const { return false; }
protected:
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
virtual wxSize DoGetBestSize() const;
virtual wxBorder GetDefaultBorder() const;
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton)

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

@@ -448,6 +448,10 @@ protected:
// choose the default border for this window
virtual wxBorder GetDefaultBorder() const;
// Translate wxBORDER_THEME (and other border styles if necessary to the value
// that makes most sense for this Windows environment
virtual wxBorder TranslateBorder(wxBorder border) const;
#if wxUSE_MENUS_NATIVE
virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
#endif // wxUSE_MENUS_NATIVE