diff --git a/interface/wx/dcbuffer.h b/interface/wx/dcbuffer.h index b4ef7813bd..6b9ccb868e 100644 --- a/interface/wx/dcbuffer.h +++ b/interface/wx/dcbuffer.h @@ -118,6 +118,27 @@ public: void Init(wxDC* dc, wxBitmap& buffer = wxNullBitmap, int style = wxBUFFER_CLIENT_AREA); //@} + + + /** + Blits the buffer to the dc, and detaches the dc from the buffer (so it + can be effectively used once only). + + Usually only called in the destructor or by the destructor of derived + classes if the BufferedDC must blit before the derived class (which may + own the dc it's blitting to) is destroyed. + */ + void UnMask(); + + /** + Set the style. + */ + void SetStyle(int style); + + /** + Get the style. + */ + int GetStyle() const; }; diff --git a/interface/wx/dialog.h b/interface/wx/dialog.h index 736b97488d..bb473f43ba 100644 --- a/interface/wx/dialog.h +++ b/interface/wx/dialog.h @@ -16,8 +16,16 @@ enum wxDialogLayoutAdaptationMode wxDIALOG_ADAPTATION_MODE_DISABLED = 2 ///< Disable this dialog overriding global status. }; +#define wxDIALOG_NO_PARENT 0x00000020 ///< Don't make owned by apps top window + #define wxDEFAULT_DIALOG_STYLE (wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX) + +#define wxDIALOG_ADAPTATION_NONE 0 ///< Don't do any layout adaptation +#define wxDIALOG_ADAPTATION_STANDARD_SIZER 1 ///< Only look for wxStdDialogButtonSizer for non-scrolling part +#define wxDIALOG_ADAPTATION_ANY_SIZER 2 ///< Also look for any suitable sizer for non-scrolling part +#define wxDIALOG_ADAPTATION_LOOSE_BUTTONS 3 ///< Also look for 'loose' standard buttons for non-scrolling part + /** @class wxDialog diff --git a/interface/wx/sashwin.h b/interface/wx/sashwin.h index 3d5c1fd136..79a4bd1ebd 100644 --- a/interface/wx/sashwin.h +++ b/interface/wx/sashwin.h @@ -174,6 +174,42 @@ public: @see GetSashVisible() */ void SetSashVisible(wxSashEdgePosition edge, bool visible); + + + /** + Get border size + */ + int GetEdgeMargin(wxSashEdgePosition edge) const; + + /** + Sets the default sash border size + */ + void SetDefaultBorderSize(int width); + + /** + Gets the default sash border size + */ + int GetDefaultBorderSize() const; + + /** + Sets the additional border size between child and sash window + */ + void SetExtraBorderSize(int width); + + /** + Gets the addition border size between child and sash window + */ + int GetExtraBorderSize() const; + + /** + Tests for x, y over sash + */ + wxSashEdgePosition SashHitTest(int x, int y, int tolerance = 2); + + /** + Resizes subwindows + */ + void SizeWindows(); };