projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Source cleaning: tabs, whitespaces, -1/wxID_ANY, TRUE/true, FALSE/false.
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
frame.h
diff --git
a/include/wx/gtk1/frame.h
b/include/wx/gtk1/frame.h
index ec5261621e5150802c0c573f8e5a4d87ec9ca20a..3befcf231f4843e014234c108a7e9019cf0b0957 100644
(file)
--- a/
include/wx/gtk1/frame.h
+++ b/
include/wx/gtk1/frame.h
@@
-11,7
+11,7
@@
#ifndef __GTKFRAMEH__
#define __GTKFRAMEH__
#ifndef __GTKFRAMEH__
#define __GTKFRAMEH__
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "frame.h"
#endif
#pragma interface "frame.h"
#endif
@@
-27,15
+27,15
@@
class wxToolBar;
class wxStatusBar;
//-----------------------------------------------------------------------------
class wxStatusBar;
//-----------------------------------------------------------------------------
-// wxFrame
GTK
+// wxFrame
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-class wxFrame
GTK
: public wxFrameBase
+class wxFrame : public wxFrameBase
{
public:
// construction
{
public:
// construction
- wxFrame
GTK
() { Init(); }
- wxFrame
GTK
(wxWindow *parent,
+ wxFrame() { Init(); }
+ wxFrame(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
@@
-56,23
+56,27
@@
public:
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr);
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr);
- virtual ~wxFrame
GTK
();
+ virtual ~wxFrame();
#if wxUSE_STATUSBAR
virtual void PositionStatusBar();
virtual wxStatusBar* CreateStatusBar(int number = 1,
#if wxUSE_STATUSBAR
virtual void PositionStatusBar();
virtual wxStatusBar* CreateStatusBar(int number = 1,
- long style = wxST_SIZEGRIP,
+ long style = wxST_SIZEGRIP
|wxFULL_REPAINT_ON_RESIZE
,
wxWindowID id = 0,
const wxString& name = wxStatusLineNameStr);
wxWindowID id = 0,
const wxString& name = wxStatusLineNameStr);
+
+ void SetStatusBar(wxStatusBar *statbar);
#endif // wxUSE_STATUSBAR
#if wxUSE_TOOLBAR
#endif // wxUSE_STATUSBAR
#if wxUSE_TOOLBAR
- virtual wxToolBar* CreateToolBar(long style =
wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT
,
+ virtual wxToolBar* CreateToolBar(long style =
-1
,
wxWindowID id = -1,
const wxString& name = wxToolBarNameStr);
void SetToolBar(wxToolBar *toolbar);
#endif // wxUSE_TOOLBAR
wxWindowID id = -1,
const wxString& name = wxToolBarNameStr);
void SetToolBar(wxToolBar *toolbar);
#endif // wxUSE_TOOLBAR
+
+ wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); }
// implementation from now on
// --------------------------
// implementation from now on
// --------------------------
@@
-82,6
+86,7
@@
public:
virtual void OnInternalIdle();
bool m_menuBarDetached;
virtual void OnInternalIdle();
bool m_menuBarDetached;
+ int m_menuBarHeight;
bool m_toolBarDetached;
protected:
bool m_toolBarDetached;
protected:
@@
-93,9
+98,17
@@
protected:
virtual void DoGetClientSize( int *width, int *height ) const;
#if wxUSE_MENUS_NATIVE
virtual void DoGetClientSize( int *width, int *height ) const;
#if wxUSE_MENUS_NATIVE
+
virtual void DetachMenuBar();
virtual void AttachMenuBar(wxMenuBar *menubar);
virtual void DetachMenuBar();
virtual void AttachMenuBar(wxMenuBar *menubar);
+
+public:
+ // Menu size is dynamic now, call this whenever it might change.
+ void UpdateMenuBarSize();
+
#endif // wxUSE_MENUS_NATIVE
#endif // wxUSE_MENUS_NATIVE
+
+ DECLARE_DYNAMIC_CLASS(wxFrame)
};
#endif // __GTKFRAMEH__
};
#endif // __GTKFRAMEH__