Source cleaning, wxW headers, whitespaces and improved PCH support.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-06-06 15:39:16 +00:00
parent 9db1b54074
commit be66f18ee1
7 changed files with 257 additions and 262 deletions

View File

@@ -1,10 +1,10 @@
///////////////////////////////////////////////////////////////////////////////
// Name: framemanager.h
// Name: wx/aui/framemanager.h
// Purpose: wxaui: wx advanced user interface - docking window manager
// Author: Benjamin I. Williams
// Modified by:
// Created: 2005-05-17
// RCS-ID:
// RCS-ID: $Id$
// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
// Licence: wxWindows Library Licence, Version 3.1
///////////////////////////////////////////////////////////////////////////////
@@ -134,7 +134,7 @@ public:
min_size = wxDefaultSize;
max_size = wxDefaultSize;
dock_proportion = 0;
DefaultPane();
}
@@ -202,7 +202,7 @@ public:
bool HasMinimizeButton() const { return HasFlag(buttonMinimize); }
bool HasPinButton() const { return HasFlag(buttonPin); }
bool HasGripperTop() const { return HasFlag(optionGripperTop); }
wxPaneInfo& Window(wxWindow* w) { window = w; return *this; }
wxPaneInfo& Name(const wxString& n) { name = n; return *this; }
wxPaneInfo& Caption(const wxString& c) { caption = c; return *this; }
@@ -236,7 +236,7 @@ public:
wxPaneInfo& PaneBorder(bool visible = true) { return SetFlag(optionPaneBorder, visible); }
wxPaneInfo& Gripper(bool visible = true) { return SetFlag(optionGripper, visible); }
wxPaneInfo& GripperTop(bool attop = true) { return SetFlag(optionGripperTop, attop); }
wxPaneInfo& CloseButton(bool visible = true) { return SetFlag(buttonClose, visible); }
wxPaneInfo& CloseButton(bool visible = true) { return SetFlag(buttonClose, visible); }
wxPaneInfo& MaximizeButton(bool visible = true) { return SetFlag(buttonMaximize, visible); }
wxPaneInfo& MinimizeButton(bool visible = true) { return SetFlag(buttonMinimize, visible); }
wxPaneInfo& PinButton(bool visible = true) { return SetFlag(buttonPin, visible); }
@@ -244,7 +244,7 @@ public:
wxPaneInfo& TopDockable(bool b = true) { return SetFlag(optionTopDockable, b); }
wxPaneInfo& BottomDockable(bool b = true) { return SetFlag(optionBottomDockable, b); }
wxPaneInfo& LeftDockable(bool b = true) { return SetFlag(optionLeftDockable, b); }
wxPaneInfo& RightDockable(bool b = true) { return SetFlag(optionRightDockable, b); }
wxPaneInfo& RightDockable(bool b = true) { return SetFlag(optionRightDockable, b); }
wxPaneInfo& Floatable(bool b = true) { return SetFlag(optionFloatable, b); }
wxPaneInfo& Movable(bool b = true) { return SetFlag(optionMovable, b); }
wxPaneInfo& Dockable(bool b = true)
@@ -260,14 +260,14 @@ public:
optionCaption | optionPaneBorder | buttonClose;
return *this;
}
wxPaneInfo& CentrePane() { return CenterPane(); }
wxPaneInfo& CenterPane()
{
state = 0;
return Center().PaneBorder().Resizable();
}
wxPaneInfo& ToolbarPane()
{
DefaultPane();
@@ -286,7 +286,7 @@ public:
state &= ~flag;
return *this;
}
bool HasFlag(unsigned int flag) const
{
return (state & flag) ? true:false;
@@ -311,7 +311,7 @@ public:
optionDestroyOnClose = 1 << 12,
optionToolbar = 1 << 13,
optionActive = 1 << 14,
optionGripperTop = 1 << 15,
optionGripperTop = 1 << 15,
buttonClose = 1 << 24,
buttonMaximize = 1 << 25,
@@ -363,13 +363,13 @@ public:
unsigned int flags = wxAUI_MGR_DEFAULT);
virtual ~wxFrameManager();
void UnInit();
void SetFlags(unsigned int flags);
unsigned int GetFlags() const;
void SetFrame(wxFrame* frame);
wxFrame* GetFrame() const;
void SetArtProvider(wxDockArt* art_provider);
wxDockArt* GetArtProvider() const;
@@ -379,22 +379,22 @@ public:
bool AddPane(wxWindow* window,
const wxPaneInfo& pane_info);
bool AddPane(wxWindow* window,
int direction = wxLEFT,
const wxString& caption = wxEmptyString);
bool InsertPane(wxWindow* window,
const wxPaneInfo& pane_info,
int insert_level = wxAUI_INSERT_PANE);
bool DetachPane(wxWindow* window);
wxString SavePerspective();
bool LoadPerspective(const wxString& perspective,
bool update = true);
void Update();
private:
@@ -500,7 +500,7 @@ private:
wxWindow* m_hint_wnd; // transparent hint window (for now, only msw)
wxTimer m_hint_fadetimer; // transparent fade timer (for now, only msw)
int m_hint_fadeamt; // transparent fade amount (for now, only msw)
DECLARE_EVENT_TABLE()
};
@@ -644,7 +644,7 @@ public:
// spectrum of events will be implemented in the next incremental version
BEGIN_DECLARE_EVENT_TYPES()
DECLARE_EVENT_TYPE(wxEVT_AUI_PANEBUTTON, 0)
DECLARE_EVENT_TYPE(wxEVT_AUI_PANEBUTTON, 0)
END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxFrameManagerEventFunction)(wxFrameManagerEvent&);