merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -36,7 +36,7 @@ enum
|
||||
wxTOPLEVEL_BUTTON_MAXIMIZE = 0x02000000,
|
||||
wxTOPLEVEL_BUTTON_ICONIZE = 0x04000000,
|
||||
wxTOPLEVEL_BUTTON_RESTORE = 0x08000000,
|
||||
wxTOPLEVEL_BUTTON_HELP = 0x10000000,
|
||||
wxTOPLEVEL_BUTTON_HELP = 0x10000000
|
||||
};
|
||||
|
||||
// frame hit test return values:
|
||||
@@ -143,7 +143,7 @@ public:
|
||||
virtual int GetMinWidth() const;
|
||||
virtual int GetMinHeight() const;
|
||||
|
||||
virtual bool ProvidesBackground() { return TRUE; }
|
||||
virtual bool ProvidesBackground() const { return TRUE; }
|
||||
|
||||
protected:
|
||||
// handle titlebar button click event
|
||||
|
Reference in New Issue
Block a user