Skip to content

Commit

Permalink
Reformat project sources according to current code style definitions
Browse files Browse the repository at this point in the history 
Apply automatic code formatting by using clang-format.
Manually adjust some aspects not covered by clang-format,
mostly create block structures by adding newlines.
  • Loading branch information
@sodevel
sodevel committed Mar 16, 2022
1 parent 5514796 commit 86b0298
Show file tree
Hide file tree
Showing 117 changed files with 29,842 additions and 33,127 deletions.
4,421 changes: 2,136 additions & 2,285 deletions plugins/additional/additional.cpp
View file

Large diffs are not rendered by default.

257 changes: 121 additions & 136 deletions plugins/containers/bookutils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,160 +21,145 @@
// Ryan Mulder - [email protected]
//
///////////////////////////////////////////////////////////////////////////////

#ifndef PLUGINS_CONTAINERS_BOOKUTILS_H
#define PLUGINS_CONTAINERS_BOOKUTILS_H

#include <component.h>
#include <default.xpm>
#include <vector>
#include <wx/listbook.h>

#include <wx/aui/auibook.h>
#include <wx/choicebk.h>
#include <wx/listbook.h>
#include <wx/simplebook.h>
#include <wx/aui/auibook.h>

#include <component.h>
#include <default.xpm>

#ifdef wxUSE_COLLPANE
#include <wx/collpane.h>
#include <wx/collpane.h>
#endif


class SuppressEventHandlers
{
private:
std::vector< wxEvtHandler* > m_handlers;
wxWindow* m_window;
std::vector<wxEvtHandler*> m_handlers;
wxWindow* m_window;

public:
SuppressEventHandlers( wxWindow* window )
:
m_window( window )
{
while ( window->GetEventHandler() != window )
{
m_handlers.push_back( window->PopEventHandler() );
}
}

~SuppressEventHandlers()
{
std::vector< wxEvtHandler* >::reverse_iterator handler;
for ( handler = m_handlers.rbegin(); handler != m_handlers.rend(); ++handler )
{
m_window->PushEventHandler( *handler );
}
}
SuppressEventHandlers(wxWindow* window) : m_window(window)
{
while (window->GetEventHandler() != window) { m_handlers.push_back(window->PopEventHandler()); }
}

~SuppressEventHandlers()
{
std::vector<wxEvtHandler*>::reverse_iterator handler;
for (handler = m_handlers.rbegin(); handler != m_handlers.rend(); ++handler) {
m_window->PushEventHandler(*handler);
}
}
};

namespace BookUtils
{
template < class T >
void AddImageList( IObject* obj, T* book )
{
if ( !obj->GetPropertyAsString( _("bitmapsize") ).empty() )
{
wxSize imageSize = obj->GetPropertyAsSize(_("bitmapsize"));
wxImageList* images = new wxImageList( imageSize.GetWidth(), imageSize.GetHeight() );
wxImage image = wxBitmap( default_xpm ).ConvertToImage();
images->Add( image.Scale( imageSize.GetWidth(), imageSize.GetHeight() ) );
book->AssignImageList( images );
}
}

template < class T >
void OnCreated( wxObject* wxobject, wxWindow* wxparent, IManager* manager, wxString name )
{
// Easy read-only property access
IObject* obj = manager->GetIObject( wxobject );

T* book = wxDynamicCast( wxparent, T );

//This wouldn't compile in MinGW - strange
///wxWindow* page = wxDynamicCast( manager->GetChild( wxobject, 0 ), wxWindow );

// Do this instead
wxObject* child = manager->GetChild( wxobject, 0 );
wxWindow* page = NULL;
if ( child->IsKindOf(CLASSINFO(wxWindow)))
{
page = (wxWindow*)child;
}

// Error checking
if ( !( obj && book && page ) )
{
wxLogError( _("%s is missing its wxFormBuilder object(%p), its parent(%p), or its child(%p)"), name.c_str(), obj, book, page );
return;
}

// Prevent event handling by wxFB - these aren't user generated events
SuppressEventHandlers suppress( book );

// Save selection
int selection = book->GetSelection();
book->AddPage( page, obj->GetPropertyAsString( _("label") ) );

// Apply image to page
IObject* parentObj = manager->GetIObject( wxparent );
if ( !parentObj )
{
wxLogError( _("%s's parent is missing its wxFormBuilder object"), name.c_str() );
return;
}

if ( !parentObj->GetPropertyAsString( _("bitmapsize") ).empty() )
{
if ( !obj->GetPropertyAsString( _("bitmap") ).empty() )
{
wxSize imageSize = parentObj->GetPropertyAsSize( _("bitmapsize") );
int width = imageSize.GetWidth();
int height = imageSize.GetHeight();
if ( width > 0 && height > 0 )
{
wxImageList* imageList = book->GetImageList();
if ( imageList != NULL )
{
wxImage image = obj->GetPropertyAsBitmap( _("bitmap") ).ConvertToImage();
imageList->Add( image.Scale( width, height ) );
book->SetPageImage( book->GetPageCount() - 1, imageList->GetImageCount() - 1 );
}
}
}
}

if ( obj->GetPropertyAsString( _("select") ) == wxT("0") && selection >= 0 )
{
book->SetSelection(selection);
}
else
{
book->SetSelection( book->GetPageCount() - 1 );
}
}

template < class T >
void OnSelected( wxObject* wxobject, IManager* manager )
{
// Get actual page - first child
wxObject* page = manager->GetChild( wxobject, 0 );
if ( NULL == page )
{
return;
}

T* book = wxDynamicCast( manager->GetParent( wxobject ), T );
if ( book )
{
for ( size_t i = 0; i < book->GetPageCount(); ++i )
{
if ( book->GetPage( i ) == page )
{
// Prevent infinite event loop
SuppressEventHandlers suppress( book );

// Select Page
book->SetSelection( i );
}
}
}
}
template <class T>
void AddImageList(IObject* obj, T* book)
{
if (!obj->GetPropertyAsString(_("bitmapsize")).empty()) {
wxSize imageSize = obj->GetPropertyAsSize(_("bitmapsize"));
wxImageList* images = new wxImageList(imageSize.GetWidth(), imageSize.GetHeight());
wxImage image = wxBitmap(default_xpm).ConvertToImage();
images->Add(image.Scale(imageSize.GetWidth(), imageSize.GetHeight()));
book->AssignImageList(images);
}
}

template <class T>
void OnCreated(wxObject* wxobject, wxWindow* wxparent, IManager* manager, wxString name)
{
// Easy read-only property access
IObject* obj = manager->GetIObject(wxobject);

T* book = wxDynamicCast(wxparent, T);

// This wouldn't compile in MinGW - strange
/// wxWindow* page = wxDynamicCast( manager->GetChild( wxobject, 0 ), wxWindow );

// Do this instead
wxObject* child = manager->GetChild(wxobject, 0);
wxWindow* page = NULL;
if (child->IsKindOf(CLASSINFO(wxWindow))) {
page = (wxWindow*)child;
}

// Error checking
if (!(obj && book && page)) {
wxLogError(
_("%s is missing its wxFormBuilder object(%p), its parent(%p), or its child(%p)"), name.c_str(), obj, book,
page);
return;
}

// Prevent event handling by wxFB - these aren't user generated events
SuppressEventHandlers suppress(book);

// Save selection
int selection = book->GetSelection();
book->AddPage(page, obj->GetPropertyAsString(_("label")));

// Apply image to page
IObject* parentObj = manager->GetIObject(wxparent);
if (!parentObj) {
wxLogError(_("%s's parent is missing its wxFormBuilder object"), name.c_str());
return;
}

if (!parentObj->GetPropertyAsString(_("bitmapsize")).empty()) {
if (!obj->GetPropertyAsString(_("bitmap")).empty()) {
wxSize imageSize = parentObj->GetPropertyAsSize(_("bitmapsize"));
int width = imageSize.GetWidth();
int height = imageSize.GetHeight();
if (width > 0 && height > 0) {
wxImageList* imageList = book->GetImageList();
if (imageList != NULL) {
wxImage image = obj->GetPropertyAsBitmap(_("bitmap")).ConvertToImage();
imageList->Add(image.Scale(width, height));
book->SetPageImage(book->GetPageCount() - 1, imageList->GetImageCount() - 1);
}
}
}
}

if (obj->GetPropertyAsString(_("select")) == wxT("0") && selection >= 0) {
book->SetSelection(selection);
} else {
book->SetSelection(book->GetPageCount() - 1);
}
}

template <class T>
void OnSelected(wxObject* wxobject, IManager* manager)
{
// Get actual page - first child
wxObject* page = manager->GetChild(wxobject, 0);
if (NULL == page) {
return;
}

T* book = wxDynamicCast(manager->GetParent(wxobject), T);
if (book) {
for (size_t i = 0; i < book->GetPageCount(); ++i) {
if (book->GetPage(i) == page) {
// Prevent infinite event loop
SuppressEventHandlers suppress(book);

// Select Page
book->SetSelection(i);
}
}
}
}
} // namespace BookUtils

#endif // PLUGINS_CONTAINERS_BOOKUTILS_H
#endif // PLUGINS_CONTAINERS_BOOKUTILS_H
Loading

0 comments on commit 86b0298

Please sign in to comment.