Commit 062fc2d2 authored by Maciej Suminski's avatar Maciej Suminski
Browse files

Some cleanup.

parent 5d704c96

common/drawpanel_gal.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWin 
{

{

    m_gal     = NULL;

    m_gal     = NULL;

    m_view    = NULL;

    m_view    = NULL;

    m_painter = NULL;





    m_galShaderPath = std::string( ::wxGetCwd().mb_str() ) + "/../../gal/opengl/shader/";

    m_galShaderPath = std::string( ::wxGetCwd().mb_str() ) + "/../../gal/opengl/shader/";

common/gal/cairo/cairo_gal.cpp

+6 −4
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ 
 */

 */





#include <wx/dcbuffer.h>

#include <wx/dcbuffer.h>

#include <wx/rawbmp.h>

#include <wx/image.h>

#include <wx/log.h>

#include <wx/log.h>





#include <gal/cairo/cairo_gal.h>

#include <gal/cairo/cairo_gal.h>
@@ -93,6 +93,9 @@ CAIRO_GAL::CAIRO_GAL( wxWindow* aParent, wxEvtHandler* aMouseListener, 




CAIRO_GAL::~CAIRO_GAL()

CAIRO_GAL::~CAIRO_GAL()

{

{

    delete cursorPixels;

    delete cursorPixelsSaved;



    // TODO Deleting of list contents like groups and paths

    // TODO Deleting of list contents like groups and paths

    deleteBitmaps();

    deleteBitmaps();

}

}
@@ -196,7 +199,6 @@ void CAIRO_GAL::EndDrawing() 
    wxBitmap     bmp( img );

    wxBitmap     bmp( img );

    wxClientDC   client_dc( this );

    wxClientDC   client_dc( this );

    wxBufferedDC dc;

    wxBufferedDC dc;

    // client_dc.DrawBitmap(bmp, 0, 0, false);

    dc.Init( &client_dc, bmp );

    dc.Init( &client_dc, bmp );





    // Destroy Cairo objects

    // Destroy Cairo objects
@@ -909,7 +911,7 @@ void CAIRO_GAL::allocateBitmaps() 




    bitmapBuffer       	= new unsigned int[bufferSize];

    bitmapBuffer       	= new unsigned int[bufferSize];

    bitmapBufferBackup 	= new unsigned int[bufferSize];

    bitmapBufferBackup 	= new unsigned int[bufferSize];

    wxOutput            = new unsigned char[bufferSize * 4];

    wxOutput            = new unsigned char[bufferSize * 3];

}

}

common/gal/opengl/opengl_gal.cpp

+0 −7
Original line number Original line Diff line number Diff line
@@ -40,14 +40,7 @@ using namespace KiGfx; 
// Prototypes

// Prototypes

void InitTesselatorCallbacks( GLUtesselator* aTesselator );

void InitTesselatorCallbacks( GLUtesselator* aTesselator );





// FIXME Checking of attributes



// #if defined(__WXGTK__)

const int glAttributes[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_DEPTH_SIZE, 16, 0 };

const int glAttributes[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_DEPTH_SIZE, 16, 0 };

// #elif defined(__WXMSW__)

// #define glAttributes NULL

// #endif







OPENGL_GAL::OPENGL_GAL( wxWindow* aParent, wxEvtHandler* aMouseListener,

OPENGL_GAL::OPENGL_GAL( wxWindow* aParent, wxEvtHandler* aMouseListener,

                        wxEvtHandler* aPaintListener, bool isUseShaders, const wxString& aName ) :

                        wxEvtHandler* aPaintListener, bool isUseShaders, const wxString& aName ) :

common/view/view.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -150,6 +150,10 @@ VIEW::VIEW( bool aIsDynamic, bool aUseGroups ) : 




VIEW::~VIEW()

VIEW::~VIEW()

{

{

    BOOST_FOREACH( LayerMap::value_type& l, m_layers )

    {

        delete l.second.items;

    }

}

}

common/view/wx_view_controls.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -126,7 +126,7 @@ void WX_VIEW_CONTROLS::onButton( wxMouseEvent& event ) 
    {

    {

        m_isDragPanning     = true;

        m_isDragPanning     = true;

        m_dragStartPoint    = VECTOR2D( event.GetX(), event.GetY() );

        m_dragStartPoint    = VECTOR2D( event.GetX(), event.GetY() );

        m_lookStartPoint    = m_view->GetCenter(); // ookAtPoint();

        m_lookStartPoint    = m_view->GetCenter();

    }

    }

    else if( event.RightUp() )

    else if( event.RightUp() )

    {

    {