projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compilation fix for STL build in wxGtkCollatableString code.
[wxWidgets.git]
/
include
/
wx
/
univ
/
frame.h
diff --git
a/include/wx/univ/frame.h
b/include/wx/univ/frame.h
index 8a5617f53e393636cc4e7c23e861fb61ce4085aa..207bf0d6b0b9b3a4c87cac82a49806147211f75b 100644
(file)
--- a/
include/wx/univ/frame.h
+++ b/
include/wx/univ/frame.h
@@
-12,15
+12,11
@@
#ifndef _WX_UNIV_FRAME_H_
#define _WX_UNIV_FRAME_H_
#ifndef _WX_UNIV_FRAME_H_
#define _WX_UNIV_FRAME_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "univframe.h"
-#endif
-
// ----------------------------------------------------------------------------
// wxFrame
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxFrame
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxFrame : public wxFrameBase
+class WXDLL
IMPEXP_CORE
wxFrame : public wxFrameBase
{
public:
wxFrame() {}
{
public:
wxFrame() {}
@@
-48,7
+44,7
@@
public:
#if wxUSE_STATUSBAR
virtual wxStatusBar* CreateStatusBar(int number = 1,
#if wxUSE_STATUSBAR
virtual wxStatusBar* CreateStatusBar(int number = 1,
- long style = wxST
_SIZEGRIP
,
+ long style = wxST
B_DEFAULT_STYLE
,
wxWindowID id = 0,
const wxString& name = wxStatusLineNameStr);
#endif // wxUSE_STATUSBAR
wxWindowID id = 0,
const wxString& name = wxStatusLineNameStr);
#endif // wxUSE_STATUSBAR
@@
-58,17
+54,13
@@
public:
virtual wxToolBar* CreateToolBar(long style = -1,
wxWindowID id = wxID_ANY,
const wxString& name = wxToolBarNameStr);
virtual wxToolBar* CreateToolBar(long style = -1,
wxWindowID id = wxID_ANY,
const wxString& name = wxToolBarNameStr);
- virtual void PositionToolBar();
#endif // wxUSE_TOOLBAR
#endif // wxUSE_TOOLBAR
- virtual int GetMinWidth() const;
- virtual int GetMinHeight() const;
-
- // sends wxSizeEvent to itself (used after attaching xxxBar)
- virtual void SendSizeEvent();
+ virtual wxSize GetMinSize() const;
protected:
void OnSize(wxSizeEvent& event);
protected:
void OnSize(wxSizeEvent& event);
+ void OnSysColourChanged(wxSysColourChangedEvent& event);
virtual void DoGetClientSize(int *width, int *height) const;
virtual void DoSetClientSize(int width, int height);
virtual void DoGetClientSize(int *width, int *height) const;
virtual void DoSetClientSize(int width, int height);
@@
-85,6
+77,11
@@
protected:
virtual void PositionStatusBar();
#endif // wxUSE_MENUS
virtual void PositionStatusBar();
#endif // wxUSE_MENUS
+protected:
+#if wxUSE_TOOLBAR
+ virtual void PositionToolBar();
+#endif // wxUSE_TOOLBAR
+
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxFrame)
};
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxFrame)
};