drawpanel.cpp change for wxWidgets 2.6 compatibility

#include "macros.h"

#include "id.h"

// defines locaux

// Local defines

#define CURSOR_SIZE 12           // Cursor size in pixels

// table des evenements captes par un WinEDA_DrawPanel

// Events used by WinEDA_DrawPanel

BEGIN_EVENT_TABLE( WinEDA_DrawPanel, EDA_DRAW_PANEL )

EVT_LEAVE_WINDOW( WinEDA_DrawPanel::OnMouseLeaving )

EVT_MOUSE_EVENTS( WinEDA_DrawPanel::OnMouseEvent )

                WinEDA_DrawPanel::Process_Popup_Zoom )

END_EVENT_TABLE()

/***********************************************************/

/* Fonctions de base de WinEDA_DrawPanel: l'ecran de trace */

/***********************************************************/

/************************************************************************/

/* WinEDA_DrawPanel basic functions (WinEDA_DrawPanel is the main panel)*/

/************************************************************************/

WinEDA_DrawPanel::WinEDA_DrawPanel( WinEDA_DrawFrame* parent, int id,

                                    const wxPoint& pos, const wxSize& size ) :

wxPoint WinEDA_DrawPanel::CalcAbsolutePosition( const wxPoint& rel_pos )

/*********************************************************************/

/* retourne la position absolue en pixels de la position rel_pos,

 *  donn�e en position relative scroll�e (en pixel)

/** Function CalcAbsolutePosition

 * @return absolute position in pixels, considering the scroll amount

 * @param rel_pos = relative position (screen position) in pixel

 *  ( relative position = position in the panel draw area on screen )

 */

{

    wxPoint pos;

#else

    int ii, jj;

    GetViewStart( &pos.x, &pos.y );

    GetViewStart( &pos.x, &pos.y ); // pos is the origin in scroll units

    GetScrollPixelsPerUnit( &ii, &jj );

    pos.x *= ii;

    pos.y *= jj;

    pos.y *= jj;    // pos is the origin in pixel units

    pos.x += rel_pos.x;

    pos.y += rel_pos.y;

wxPoint WinEDA_DrawPanel::CursorRealPosition( const wxPoint& ScreenPos )

/**********************************************************************/

/* Retourne la position en unites utilisateur du pointeur souris

 *  ScreenPos = position pointeur en coord absolue ecran

/** CursorRealPosition (used to calculate the cursor position in internal units)

 * @return  position (in internal units)

 * @param  ScreenPos = absolute position in pixels

 */

{

    wxPoint curpos;

bool WinEDA_DrawPanel::IsPointOnDisplay( wxPoint ref_pos )

/********************************************************/

/* retourne TRUE si le point de coord physique ref_pos

 *  est visible sur l'ecran, c'est a dire:

 *  si ref_pos est sur la partie du schema ou pcb affichee a l'ecran

/** Funcion IsPointOnDisplay

 * @param ref_pos is the position to test in pixels, relative to the panel.

 * @return TRUE if ref_pos is a point currently visible on screen

 *         FALSE if ref_pos is out of screen

 */

{

    wxPoint  pos;

wxPoint WinEDA_DrawPanel::CursorScreenPosition()

/********************************************************/

/* retourne la position sur l'ecran,en pixels, du curseur

 *  Orgine = coord absolue 0,0;

/** CursorScreenPosition

 * @return  relative position in pixels of du curseur

 *  ( relative position = position in the panel draw area on screen )

 */

{

    wxPoint curpos = GetScreen()->m_Curseur;

/*********************************************************/

wxPoint WinEDA_DrawPanel::GetScreenCenterRealPosition()

/*********************************************************/

/** Function GetScreenCenterRealPosition()

 * @return position (in internal units) of the current area centre showed on screen

 */

{

    wxSize  size;

    wxPoint realpos;

/********************************************************/

void WinEDA_DrawPanel::OnActivate( wxActivateEvent& event )

/********************************************************/

/**

 * Called on window activation.

 * init the member m_CanStartBlock to avoid a block start command

 * on activation (because a left mouse buton can be pressed and no block command wanted

 * This happens when enter on a hierarchycat sheet on double click

 */

{

    m_CanStartBlock = -1;   // Block Command can't start

    event.Skip();

/******************************************/

void WinEDA_DrawPanel::SetBoundaryBox()

/******************************************/

/** Function SetBoundaryBox()

 * set the m_ClipBox member to the current displayed rectangle dimensions

 */

{

    BASE_SCREEN* Screen = GetScreen();;

void WinEDA_DrawPanel::DrawBackGround( wxDC* DC )

/***********************************************/

/* Trace les axes X et Y et la grille

 *  La grille n'est affichee que si elle peut etre facilement visible

 *  La grille passe toujours par le centre de l'ecran

/**  Function DrawBackGround

 * @param DC = current Device Context

 * Draws X , Y axis

 * draws the grid

 *  - the grid is drawn only if the zoom level allows a good visibility

 *  - the grid is always centered on the screen centre

 */

{

    int          Color  = BLUE;

    GRSetDrawMode( DC, GR_COPY );

    /* le pas d'affichage doit etre assez grand pour avoir une grille visible */

    /* The grid must be visible. this is possible only is grid value

     * and zoom value are sufficient

     */

    drawgrid = m_Parent->m_Draw_Grid;

    pas_grille_affichee = screen->GetGrid();

        ii *= 2;

    }

    if( ii < 5 )

        drawgrid = FALSE;           // grille trop petite

        drawgrid = FALSE; // The gris is small

    ii = pas_grille_affichee.y / zoom;

    if( ii  < 5 )

        ii *= 2;

    }

    if( ii < 5 )

        drawgrid = FALSE;           // grille trop petite

        drawgrid = FALSE; // The gris is small

    GetViewStart( &org.x, &org.y );

    GetScrollPixelsPerUnit( &ii, &jj );

/********************************************************************/

void WinEDA_DrawPanel::m_Draw_Auxiliary_Axis( wxDC* DC, int drawmode )

/********************************************************************/

/** m_Draw_Auxiliary_Axis

 * Draw the Auxiliary Axis, used in pcbnew which as origin coordinates

 * for gerber and excellon files

 */

{

    if( m_Parent->m_Auxiliary_Axis_Position.x == 0

        && m_Parent->m_Auxiliary_Axis_Position.y == 0 )

        m_CanStartBlock = -1;

    }

    if( ManageCurseur == NULL )  // Pas de commande en cours

    if( ManageCurseur == NULL )  // No command in progress

        m_AutoPAN_Request = FALSE;

    if( m_Parent->m_FrameIsActive )

    g_MouseOldButtons = localrealbutt;

    // Appel des fonctions li�es au Double Click ou au Click

    // Calling Double Click and Click functions :

    if( localbutt == (int) (GR_M_LEFT_DOWN | GR_M_DCLICK) )

    {

        m_Parent->OnLeftDClick( &DC, screen->m_MousePositionInPixels );

        IgnoreNextLeftButtonRelease = true;

    }

    else if( event.LeftUp() )

    {

        if( screen->BlockLocate.m_State==STATE_NO_BLOCK  &&  !IgnoreNextLeftButtonRelease )

    }

    /* Appel de la fonction generale de gestion des mouvements souris

     *  et commandes clavier */

    /* Calling the  general function on mouse changes (and pseudo key commands) */

    m_Parent->GeneralControle( &DC, screen->m_MousePositionInPixels );

        if( event.ButtonUp( 1 ) || event.ButtonUp( 2 ) )

        {

            /* Relachement du bouton: fin de delimitation de block.

             * La commande peut etre terminee (DELETE) ou continuer par le placement

             * du block ainsi delimite (MOVE, COPY).

             * Cependant bloc est annule si sa taille est trop petite

            /* Release the mouse button: end of block.

             * The command can finish (DELETE) or have a next command

             * (MOVE, COPY).

             * However the block command is cancelled if the block size is small

             */

            bool BlockIsSmall =

                ( ABS( screen->BlockLocate.GetWidth() / GetZoom() ) < 3)

        }

    }

    // Arret de block sur un double click ( qui peut provoquer un move block

    // si on d�place la souris dans ce double click

    // End of block command on a double click

    // To avoid an unwanted block move command if the move is moved while double click

    if( localbutt == (int) (GR_M_LEFT_DOWN | GR_M_DCLICK) )

    {

        if( screen->BlockLocate.m_Command != BLOCK_IDLE )

        }

    }

#if wxCHECK_VERSION(2, 8, 0)

    /* some key commands use the mouse position: refresh it */

#if wxCHECK_VERSION( 2, 8, 0 )

    wxPoint mouse_pos = wxGetMousePosition();   // Get the mouse position on screen

    wxPoint win_pos   = GetScreenPosition();    // get the draw area (panel)position on screen

    mouse_pos -= win_pos;                       // mouse_pos = is the mouse position relative to the panel

    /* Compute absolute m_MousePosition in user units: */

    Screen->m_MousePosition = CursorRealPosition( Screen->m_MousePositionInPixels );

    #else

    /* if wxGetMousePosition() does not exist,

     * m_Cursor should be ok, use it to calculate the cursor position on screen

     */

    Screen->m_MousePositionInPixels = CursorScreenPosition();

#endif

    m_Parent->GeneralControle( &DC, Screen->m_MousePositionInPixels );