Minor cleanup and changes from Code Review comments.

This commit is contained in:
Robin Dunn
2018-02-10 15:13:01 -08:00
parent 5e01658cdc
commit bd1e13df42
4 changed files with 12 additions and 26 deletions

View File

@@ -2,7 +2,6 @@
// Name: wx/aui/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:
// Created: 2005-05-17 // Created: 2005-05-17
// 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
@@ -29,5 +28,3 @@ protected:
virtual void OnMoving(const wxRect& windowRect, wxDirection dir); virtual void OnMoving(const wxRect& windowRect, wxDirection dir);
virtual void OnMoveFinished(); virtual void OnMoveFinished();
}; };

View File

@@ -3847,8 +3847,6 @@ public:
void SetDataBuffer( void* buf ); void SetDataBuffer( void* buf );
int GetDragFlags() const; int GetDragFlags() const;
void SetDropEffect( wxDragResult effect ); void SetDropEffect( wxDragResult effect );
void SetEditCancelled();
}; };

View File

@@ -10,15 +10,6 @@
/// the appropriate size /// the appropriate size
#define wxGRID_AUTOSIZE (-1) #define wxGRID_AUTOSIZE (-1)
/// Many wxGrid methods work either with columns or rows, this enum is used for
/// the parameter indicating which one should it be
enum wxGridDirection
{
wxGRID_COLUMN,
wxGRID_ROW
};
/** /**
@class wxGridCellRenderer @class wxGridCellRenderer

View File

@@ -123,21 +123,21 @@ public:
wxObject *GetClientData() const; wxObject *GetClientData() const;
virtual bool Enable(bool enable); bool Enable(bool enable);
virtual bool Toggle(bool toggle); bool Toggle(bool toggle);
virtual bool SetToggle(bool toggle); bool SetToggle(bool toggle);
virtual bool SetShortHelp(const wxString& help); bool SetShortHelp(const wxString& help);
virtual bool SetLongHelp(const wxString& help); bool SetLongHelp(const wxString& help);
void Toggle(); void Toggle();
virtual void SetNormalBitmap(const wxBitmap& bmp); void SetNormalBitmap(const wxBitmap& bmp);
virtual void SetDisabledBitmap(const wxBitmap& bmp); void SetDisabledBitmap(const wxBitmap& bmp);
virtual void SetLabel(const wxString& label); void SetLabel(const wxString& label);
void SetClientData(wxObject *clientData); void SetClientData(wxObject *clientData);
virtual void Detach();
virtual void Attach(wxToolBarBase *tbar);
virtual void SetDropdownMenu(wxMenu *menu); void Detach();
void Attach(wxToolBarBase *tbar);
void SetDropdownMenu(wxMenu *menu);
wxMenu *GetDropdownMenu() const; wxMenu *GetDropdownMenu() const;
}; };