Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/aui/aui.h
View File

@@ -1,10 +1,10 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: aui.h // Name: wx/aui/aui.h
// Purpose: wxaui: wx advanced user interface - docking window manager // Purpose: wxaui: wx advanced user interface - docking window manager
// Author: Benjamin I. Williams // Author: Benjamin I. Williams
// Modified by: // Modified by:
// Created: 2005-05-17 // Created: 2005-05-17
// RCS-ID: // RCS-ID: $Id$
// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved. // Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
// Licence: wxWindows Library Licence, Version 3.1 // Licence: wxWindows Library Licence, Version 3.1
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

4
include/wx/aui/dockart.h
View File

@@ -1,10 +1,10 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: dockart.h // Name: wx/aui/dockart.h
// Purpose: wxaui: wx advanced user interface - docking window manager // Purpose: wxaui: wx advanced user interface - docking window manager
// Author: Benjamin I. Williams // Author: Benjamin I. Williams
// Modified by: // Modified by:
// Created: 2005-05-17 // Created: 2005-05-17
// RCS-ID: // RCS-ID: $Id$
// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved. // Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
// Licence: wxWindows Library Licence, Version 3.1 // Licence: wxWindows Library Licence, Version 3.1
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

6
include/wx/aui/floatpane.h
View File

@@ -1,10 +1,10 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: floatpane.h // Name: wx/aui/floatpane.h
// Purpose: wxaui: wx advanced user interface - docking window manager // Purpose: wxaui: wx advanced user interface - docking window manager
// Author: Benjamin I. Williams // Author: Benjamin I. Williams
// Modified by: // Modified by:
// Created: 2005-05-17 // Created: 2005-05-17
// RCS-ID: // RCS-ID: $Id$
// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved. // Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
// Licence: wxWindows Library Licence, Version 3.1 // Licence: wxWindows Library Licence, Version 3.1
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@@ -34,7 +34,7 @@ class WXDLLIMPEXP_AUI wxFloatingPane : public wxFloatingPaneBaseClass
public: public:
wxFloatingPane(wxWindow* parent, wxFloatingPane(wxWindow* parent,
wxFrameManager* owner_mgr, wxFrameManager* owner_mgr,
wxWindowID id = -1, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize); const wxSize& size = wxDefaultSize);
~wxFloatingPane(); ~wxFloatingPane();

4
include/wx/aui/framemanager.h
View File

@@ -1,10 +1,10 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: framemanager.h // Name: wx/aui/framemanager.h
// Purpose: wxaui: wx advanced user interface - docking window manager // Purpose: wxaui: wx advanced user interface - docking window manager
// Author: Benjamin I. Williams // Author: Benjamin I. Williams
// Modified by: // Modified by:
// Created: 2005-05-17 // Created: 2005-05-17
// RCS-ID: // RCS-ID: $Id$
// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved. // Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
// Licence: wxWindows Library Licence, Version 3.1 // Licence: wxWindows Library Licence, Version 3.1
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

43
src/aui/dockart.cpp
View File

@@ -1,10 +1,10 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: dockart.cpp // Name: src/aui/dockart.cpp
// Purpose: wxaui: wx advanced user interface - docking window manager // Purpose: wxaui: wx advanced user interface - docking window manager
// Author: Benjamin I. Williams // Author: Benjamin I. Williams
// Modified by: // Modified by:
// Created: 2005-05-17 // Created: 2005-05-17
// RCS-ID: // RCS-ID: $Id$
// Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved // Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
// Licence: wxWindows Library Licence, Version 3.1 // Licence: wxWindows Library Licence, Version 3.1
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@@ -26,17 +26,12 @@
#if wxUSE_AUI #if wxUSE_AUI
#include "wx/image.h" #include "wx/image.h"
#include "wx/dcclient.h"
#include "wx/settings.h"
#include "wx/aui/framemanager.h" #include "wx/aui/framemanager.h"
#include "wx/aui/dockart.h" #include "wx/aui/dockart.h"
#ifdef __WXMAC__
#include "wx/mac/private.h"
#endif
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
// #include "wx/log.h" #include "wx/settings.h"
#include "wx/dcclient.h"
#endif #endif
// -- wxDefaultDockArt class implementation -- // -- wxDefaultDockArt class implementation --
@@ -54,9 +49,9 @@
static wxColor StepColour(const wxColor& c, int percent) static wxColor StepColour(const wxColor& c, int percent)
{ {
int r = c.Red(), g = c.Green(), b = c.Blue(); int r = c.Red(), g = c.Green(), b = c.Blue();
return wxColour(wxMin((r*percent)/100,255), return wxColour((unsigned char)wxMin((r*percent)/100,255),
wxMin((g*percent)/100,255), (unsigned char)wxMin((g*percent)/100,255),
wxMin((b*percent)/100,255)); (unsigned char)wxMin((b*percent)/100,255));
} }
static wxColor LightContrastColour(const wxColour& c) static wxColor LightContrastColour(const wxColour& c)
@@ -106,7 +101,9 @@ static void DrawGradientRectangle(wxDC& dc,
int g = start_color.Green() + ((i*gd*100)/high)/100; int g = start_color.Green() + ((i*gd*100)/high)/100;
int b = start_color.Blue() + ((i*bd*100)/high)/100; int b = start_color.Blue() + ((i*bd*100)/high)/100;
wxPen p(wxColor(r,g,b)); wxPen p(wxColor((unsigned char)r,
(unsigned char)g,
(unsigned char)b));
dc.SetPen(p); dc.SetPen(p);
if (direction == wxAUI_GRADIENT_VERTICAL) if (direction == wxAUI_GRADIENT_VERTICAL)
@@ -240,16 +237,16 @@ wxColour wxDefaultDockArt::GetColour(int id)
{ {
switch (id) switch (id)
{ {
case wxAUI_ART_BACKGROUND_COLOUR: return m_background_brush.GetColour(); break; case wxAUI_ART_BACKGROUND_COLOUR: return m_background_brush.GetColour();
case wxAUI_ART_SASH_COLOUR: return m_sash_brush.GetColour(); break; case wxAUI_ART_SASH_COLOUR: return m_sash_brush.GetColour();
case wxAUI_ART_INACTIVE_CAPTION_COLOUR: return m_inactive_caption_colour; break; case wxAUI_ART_INACTIVE_CAPTION_COLOUR: return m_inactive_caption_colour;
case wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR: return m_inactive_caption_gradient_colour; break; case wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR: return m_inactive_caption_gradient_colour;
case wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR: return m_inactive_caption_text_colour; break; case wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR: return m_inactive_caption_text_colour;
case wxAUI_ART_ACTIVE_CAPTION_COLOUR: return m_active_caption_colour; break; case wxAUI_ART_ACTIVE_CAPTION_COLOUR: return m_active_caption_colour;
case wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR: return m_active_caption_gradient_colour; break; case wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR: return m_active_caption_gradient_colour;
case wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR: return m_active_caption_text_colour; break; case wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR: return m_active_caption_text_colour;
case wxAUI_ART_BORDER_COLOUR: return m_border_pen.GetColour(); break; case wxAUI_ART_BORDER_COLOUR: return m_border_pen.GetColour();
case wxAUI_ART_GRIPPER_COLOUR: return m_gripper_brush.GetColour(); break; case wxAUI_ART_GRIPPER_COLOUR: return m_gripper_brush.GetColour();
default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break;
} }

9
src/aui/floatpane.cpp
View File

@@ -1,10 +1,10 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: floatpane.cpp // Name: src/aui/floatpane.cpp
// Purpose: wxaui: wx advanced user interface - docking window manager // Purpose: wxaui: wx advanced user interface - docking window manager
// Author: Benjamin I. Williams // Author: Benjamin I. Williams
// Modified by: // Modified by:
// Created: 2005-05-17 // Created: 2005-05-17
// RCS-ID: // RCS-ID: $Id$
// Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved // Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
// Licence: wxWindows Library Licence, Version 3.1 // Licence: wxWindows Library Licence, Version 3.1
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@@ -30,15 +30,14 @@
#include "wx/aui/dockart.h" #include "wx/aui/dockart.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
// #include "wx/log.h"
#endif #endif
wxFloatingPane::wxFloatingPane(wxWindow* parent, wxFloatingPane::wxFloatingPane(wxWindow* parent,
wxFrameManager* owner_mgr, wxFrameManager* owner_mgr,
wxWindowID id /*= -1*/, wxWindowID id /*= wxID_ANY*/,
const wxPoint& pos /*= wxDefaultPosition*/, const wxPoint& pos /*= wxDefaultPosition*/,
const wxSize& size /*= wxDefaultSize*/) const wxSize& size /*= wxDefaultSize*/)
: wxFloatingPaneBaseClass(parent, id, wxT(""), pos, size, : wxFloatingPaneBaseClass(parent, id, wxEmptyString, pos, size,
wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION | wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION |
wxCLOSE_BOX | wxFRAME_NO_TASKBAR | wxCLOSE_BOX | wxFRAME_NO_TASKBAR |
wxFRAME_FLOAT_ON_PARENT | wxCLIP_CHILDREN) wxFRAME_FLOAT_ON_PARENT | wxCLIP_CHILDREN)

23
src/aui/framemanager.cpp
View File

@@ -1,10 +1,10 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: framemanager.cpp // Name: src/aui/framemanager.cpp
// Purpose: wxaui: wx advanced user interface - docking window manager // Purpose: wxaui: wx advanced user interface - docking window manager
// Author: Benjamin I. Williams // Author: Benjamin I. Williams
// Modified by: // Modified by:
// Created: 2005-05-17 // Created: 2005-05-17
// RCS-ID: // RCS-ID: $Id$
// Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved // Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
// Licence: wxWindows Library Licence, Version 3.1 // Licence: wxWindows Library Licence, Version 3.1
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@@ -30,16 +30,15 @@
#include "wx/aui/floatpane.h" #include "wx/aui/floatpane.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
// #include "wx/log.h" #include "wx/settings.h"
#include "wx/app.h"
#include "wx/dcclient.h"
#include "wx/dcscreen.h"
#endif #endif
//#include "wx/dcbuffer.h" //#include "wx/dcbuffer.h"
#include "wx/dcclient.h"
#include "wx/dcscreen.h"
#include "wx/app.h"
#include "wx/image.h" #include "wx/image.h"
#include "wx/settings.h"
#include "wx/toolbar.h" #include "wx/toolbar.h"
#if wxUSE_MDI #if wxUSE_MDI
@@ -117,7 +116,7 @@ static void MakeWindowTransparent(wxWindow* wnd, int amount)
if (0 == (exstyle & 0x80000) /*WS_EX_LAYERED*/) if (0 == (exstyle & 0x80000) /*WS_EX_LAYERED*/)
SetWindowLong(hwnd, GWL_EXSTYLE, exstyle | 0x80000 /*WS_EX_LAYERED*/); SetWindowLong(hwnd, GWL_EXSTYLE, exstyle | 0x80000 /*WS_EX_LAYERED*/);
pSetLayeredWindowAttributes(hwnd, 0, amount, 2 /*LWA_ALPHA*/); pSetLayeredWindowAttributes(hwnd, 0, (BYTE)amount, 2 /*LWA_ALPHA*/);
} }
#endif #endif
@@ -576,7 +575,7 @@ bool wxFrameManager::AddPane(wxWindow* window, const wxPaneInfo& pane_info)
pinfo.window = window; pinfo.window = window;
// if the pane's name identifier is blank, create a random string // if the pane's name identifier is blank, create a random string
if (pinfo.name.IsEmpty()) if (pinfo.name.empty())
{ {
pinfo.name.Printf(wxT("%08x%08x%08x%08x"), pinfo.name.Printf(wxT("%08x%08x%08x%08x"),
((unsigned long)pinfo.window) & 0xffffffff, ((unsigned long)pinfo.window) & 0xffffffff,
@@ -738,7 +737,7 @@ bool wxFrameManager::DetachPane(wxWindow* window)
static wxString EscapeDelimiters(const wxString& s) static wxString EscapeDelimiters(const wxString& s)
{ {
wxString result; wxString result;
result.Alloc(s.Length()); result.Alloc(s.length());
const wxChar* ch = s.c_str(); const wxChar* ch = s.c_str();
while (*ch) while (*ch)
{ {
@@ -846,7 +845,7 @@ bool wxFrameManager::LoadPerspective(const wxString& layout, bool update)
pane_part.Trim(true); pane_part.Trim(true);
// if the string is empty, we're done parsing // if the string is empty, we're done parsing
if (pane_part.IsEmpty()) if (pane_part.empty())
break; break;
@@ -885,7 +884,7 @@ bool wxFrameManager::LoadPerspective(const wxString& layout, bool update)
value.Trim(true); value.Trim(true);
value.Trim(false); value.Trim(false);
if (val_name.IsEmpty()) if (val_name.empty())
break; break;
if (val_name == wxT("name")) if (val_name == wxT("name"))