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

Source cleaning.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-07-24 06:30:49 +00:00
parent 6bdeda4785
commit 4444d148a5
4 changed files with 231 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/aui/auibook.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Name: wx/aui/notebook.h
// Name: wx/aui/auibook.h
// Purpose: wxaui: wx advanced user interface - notebook
// Author: Benjamin I. Williams
// Modified by:
@@ -18,13 +18,12 @@
// ----------------------------------------------------------------------------
#include "wx/defs.h"
#include "wx/aui/framemanager.h"
#include "wx/aui/dockart.h"
#include "wx/aui/floatpane.h"
#if wxUSE_AUI
#include "wx/aui/framemanager.h"
#include "wx/aui/dockart.h"
#include "wx/aui/floatpane.h"
// event declarations/classes

5
include/wx/aui/tabmdi.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/generic/mdig.h
// Name: wx/generic/tabmdi.h
// Purpose: Generic MDI (Multiple Document Interface) classes
// Author: Hans Van Leemputten
// Modified by: Benjamin I. Williams / Kirix Corporation
@@ -21,9 +21,6 @@
#include "wx/notebook.h"
#include "wx/aui/auibook.h"
extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------

13
src/aui/auibook.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Name: src/aui/notebook.cpp
// Name: src/aui/auibook.cpp
// Purpose: wxaui: wx advanced user interface - notebook
// Author: Benjamin I. Williams
// Modified by:
@@ -20,14 +20,15 @@
#if wxUSE_AUI
#include "wx/settings.h"
#include "wx/aui/auibook.h"
#include "wx/aui/tabmdi.h"
#include "wx/dcbuffer.h"
#ifndef WX_PRECOMP
#include "wx/settings.h"
#endif
#include "wx/aui/tabmdi.h"
#include "wx/dcbuffer.h"
#include "wx/arrimpl.cpp"
WX_DEFINE_OBJARRAY(wxAuiNotebookPageArray)
WX_DEFINE_OBJARRAY(wxAuiTabContainerButtonArray)
@@ -609,7 +610,7 @@ wxAuiTabCtrl::wxAuiTabCtrl(wxWindow* parent,
m_is_dragging = false;
m_hover_button = NULL;
// copied from dockart-- needs to put in a common place
// FIXME: copied from dockart-- needs to put in a common place
static unsigned char close_bits[]={
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xef,0xfb,0xcf,0xf9,
0x9f,0xfc,0x3f,0xfe,0x3f,0xfe,0x9f,0xfc,0xcf,0xf9,0xef,0xfb,
@@ -939,7 +940,7 @@ void wxAuiMultiNotebook::InitNotebook()
dc.GetTextExtent(wxT("ABCDEFGHhijklm"), &tx, &ty);
m_tab_ctrl_height = (ty*150)/100;
m_dummy_wnd = new wxWindow(this, -1, wxPoint(0,0), wxSize(0,0));
m_dummy_wnd = new wxWindow(this, wxID_ANY, wxPoint(0,0), wxSize(0,0));
m_dummy_wnd->SetSize(200, 200);
m_dummy_wnd->Show(false);

12
src/aui/tabmdi.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: src/generic/mdig.cpp
// Name: src/generic/tabmdi.cpp
// Purpose: Generic MDI (Multiple Document Interface) classes
// Author: Hans Van Leemputten
// Modified by: Benjamin I. Williams / Kirix Corporation
@@ -26,7 +26,6 @@
#if wxUSE_MDI
#include "wx/settings.h"
#include "wx/aui/tabmdi.h"
#ifndef WX_PRECOMP
@@ -34,6 +33,7 @@
#include "wx/menu.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/settings.h"
#endif //WX_PRECOMP
#include "wx/stockitem.h"
@@ -230,7 +230,7 @@ wxTabMDIClientWindow *wxTabMDIParentFrame::OnCreateClient()
void wxTabMDIParentFrame::ActivateNext()
{
if (m_pClientWindow && m_pClientWindow->GetSelection() != -1)
if (m_pClientWindow && m_pClientWindow->GetSelection() != wxNOT_FOUND)
{
size_t active = m_pClientWindow->GetSelection() + 1;
if (active >= m_pClientWindow->GetPageCount())
@@ -242,7 +242,7 @@ void wxTabMDIParentFrame::ActivateNext()
void wxTabMDIParentFrame::ActivatePrevious()
{
if (m_pClientWindow && m_pClientWindow->GetSelection() != -1)
if (m_pClientWindow && m_pClientWindow->GetSelection() != wxNOT_FOUND)
{
int active = m_pClientWindow->GetSelection() - 1;
if (active < 0)
@@ -623,7 +623,7 @@ void wxTabMDIChildFrame::ApplyMDIChildFrameRect()
IMPLEMENT_DYNAMIC_CLASS(wxTabMDIClientWindow, wxAuiMultiNotebook)
BEGIN_EVENT_TABLE(wxTabMDIClientWindow, wxAuiMultiNotebook)
EVT_AUINOTEBOOK_PAGE_CHANGED(-1, wxTabMDIClientWindow::OnPageChanged)
EVT_AUINOTEBOOK_PAGE_CHANGED(wxID_ANY, wxTabMDIClientWindow::OnPageChanged)
EVT_SIZE(wxTabMDIClientWindow::OnSize)
END_EVENT_TABLE()
@@ -646,7 +646,7 @@ bool wxTabMDIClientWindow::CreateClient(wxTabMDIParentFrame* parent, long style)
SetWindowStyleFlag(style);
if (!wxAuiMultiNotebook::Create(parent,
-1,
wxID_ANY,
wxPoint(0,0),
wxSize(100, 100),
wxNO_BORDER))