Commit d3468dd5 authored by dickelbeck's avatar dickelbeck
Browse files

Marco's AUI patch, basically

parent 69e3f671

3d-viewer/3d_frame.cpp

+26 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "trackball.h"



#include <wx/colordlg.h>

#include <wxstruct.h>



Info_3D_Visu g_Parm_3D_Visu;

double g_Draw3d_dx;
@@ -79,6 +80,30 @@ WinEDA3D_DrawFrame::WinEDA3D_DrawFrame( WinEDA_BasePcbFrame* parent, 


    // Make a Pcb3D_GLCanvas

    m_Canvas = new Pcb3D_GLCanvas( this );

#if KICAD_AUIMANAGER

    m_auimgr.SetManagedWindow(this);

    

    wxAuiPaneInfo horiz;

    horiz.Gripper(false);

    horiz.DockFixed(true);

    horiz.Movable(false);

    horiz.Floatable(false);

    horiz.CloseButton(false);

    horiz.CaptionVisible(false);

    

    wxAuiPaneInfo vert(horiz);

    

    vert.TopDockable(false).BottomDockable(false);

    horiz.LeftDockable(false).RightDockable(false);

    

    m_auimgr.AddPane(m_HToolBar,

        wxAuiPaneInfo(horiz).Name(wxT("m_HToolBar")).Top());

    

    m_auimgr.AddPane(m_Canvas,

        wxAuiPaneInfo().Name(wxT("DrawFrame")).CentrePane());



    m_auimgr.Update();

#endif

}
@@ -127,7 +152,7 @@ void WinEDA3D_DrawFrame::GetSettings() 
        config->Read( wxT( "BgColor_Blue" ),

                      &g_Parm_3D_Visu.m_BgColor.m_Blue, 0.0 );

    }

#ifdef __WXMAC__

#if defined( __WXMAC__ ) && !defined( __WXOSX_COCOA__ )



    // for macOSX, the window must be below system (macOSX) toolbar

    if( m_FramePos.y < GetMBarHeight() )

3d-viewer/3d_toolbar.cpp

+3 −3
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar() 




    m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE );



    SetToolBar( m_HToolBar );



#if !KICAD_AUIMANAGER

    SetToolBar( (wxToolBar*)m_HToolBar );

#endif

    // Set up toolbar

    m_HToolBar->AddTool( ID_RELOAD3D_BOARD, wxEmptyString,

                         wxBitmap( import3d_xpm ),

3d-viewer/3d_viewer.h

+6 −3
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ private: 
#if wxCHECK_VERSION( 2, 9, 0 )

    wxGLContext* m_glRC;

#endif



public:

    Pcb3D_GLCanvas( WinEDA3D_DrawFrame *parent );

    ~Pcb3D_GLCanvas();
@@ -178,12 +177,16 @@ class WinEDA3D_DrawFrame: public wxFrame 
public:

    WinEDA_BasePcbFrame * m_Parent;

    Pcb3D_GLCanvas * m_Canvas;

    wxToolBar * m_HToolBar;

    wxToolBar * m_VToolBar;

    WinEDA_Toolbar * m_HToolBar;

    WinEDA_Toolbar * m_VToolBar;

    int m_InternalUnits;

    wxPoint m_FramePos;

    wxSize m_FrameSize;



#if KICAD_AUIMANAGER

    wxAuiManager      m_auimgr;

	~WinEDA3D_DrawFrame() { m_auimgr.UnInit(); };

#endif 

private:

    wxString m_FrameName;       // name used for writting and reading setup

                                // It is "Frame3D"

common/basicframe.cpp

+2 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ WinEDA_BasicFrame::WinEDA_BasicFrame( wxWindow* father, 
                                                      * zone utilisateur de la fenetre principale */

    m_FramePos.x   = m_FramePos.y = 0;

    m_FrameSize.y -= m_MsgFrameHeight;



}
@@ -114,7 +115,7 @@ void WinEDA_BasicFrame::LoadSettings() 
    }



    // Ensure Window title bar is visible

#ifdef __WXMAC__

#if defined( __WXMAC__ ) && !defined( __WXOSX_COCOA__ )



    // for macOSX, the window must be below system (macOSX) toolbar

    Ypos_min = GetMBarHeight();

common/drawframe.cpp

+9 −1
Original line number Diff line number Diff line
@@ -116,6 +116,9 @@ WinEDA_DrawFrame::~WinEDA_DrawFrame() 
{

    if( m_CurrentScreen != NULL )

        delete m_CurrentScreen;

#if KICAD_AUIMANAGER

    m_auimgr.UnInit();

#endif

}
@@ -322,6 +325,10 @@ void WinEDA_DrawFrame::SetToolbars() 
/***************************************/

{

    DisplayUnitsMsg();

#if KICAD_AUIMANAGER

if(m_auimgr.GetManagedWindow())

    m_auimgr.Update();

#endif

}
@@ -391,6 +398,7 @@ void WinEDA_DrawFrame::OnSize( wxSizeEvent& SizeEv ) 
    m_FrameSize = size;

    size.y -= m_MsgFrameHeight;



#if !KICAD_AUIMANAGER

    if( MsgPanel ) // Positionnement en bas d'ecran

    {

        MsgPanel->SetSize( 0, size.y, size.x, m_MsgFrameHeight );
@@ -446,7 +454,7 @@ void WinEDA_DrawFrame::OnSize( wxSizeEvent& SizeEv ) 
                            size.y - opt_size.y - 1 );

        DrawPanel->Move( opt_size.x, opt_size.y + Auxtoolbar_size.y + 1 );

    }



#endif

    SizeEv.Skip();

}