Commit 721d878f authored by dickelbeck's avatar dickelbeck
Browse files

GetScreen() work, menu capitalization, beautifying

parent 25d04032

change_log.txt

+19 −4
Original line number Diff line number Diff line
@@ -5,18 +5,33 @@ Started 2007-June-11 
Please add newer entries at the top, list the date and your name with

email address.



2008-Apr-17 UPDATE   Dick Hollenbeck <dick@softplc.com>

================================================================================

+all

  * Made a little more sense out of the GetScreen() problem by making it

    non-virtual, and having the two types of frame classes (eeschema's and pcbnew's)

    each return their respective types of screens {SCH,PCB}_SCREEN*.

  * Added GetBaseScreen() as the virtual function which always returns BASE_SCREEN*.

  * Made WinEDA_DrawFrame::GeneralControle( wxDC* DC, wxPoint Mouse ){ dummy }

  * Added WinEDA_SchematicFrame::GeneralControle( wxDC* DC, wxPoint Mouse );

  * Moved to void <class>::Place( WinEDA_SchematicFrame* frame, wxDC* DC ) from

    void <class>::Place( WinEDA_DrawFrame* frame, wxDC* DC ) so that these

    functions can use the new SCH_SCREEN* WinEDA_SchematicFrame::GetScreen()

    function (the non-virtual one that returns SCH_SCREEN* not BASE_SCREEN*).

  * Made some menus conformant to UIpolicies.txt regarding uppercase.

  * Beautified 5-10 files.





2008-Apr-17 UPDATE  Jean-Pierre Charras <jean-pierre.charras@inpg.fr>

================================================================================

+eeschema

    very small bug in display component info removed



+pcbnew

+cvpcb

    removed bug: forgotten paths when adding lib files when not in the default lib path

    (same problem as in eeschema, solved in 2008-Apr-09 Update)







2008-Apr-16 UPDATE  Jean-Pierre Charras <jean-pierre.charras@inpg.fr>

================================================================================

+eeschema

common/block_commande.cpp

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ bool WinEDA_DrawFrame::HandleBlockBegin( wxDC* DC, int key, 
 *  Init the Block infos: command type, initial position, and other variables..

 */

{

    DrawBlockStruct* Block = & GetScreen()->BlockLocate;

    DrawBlockStruct* Block = & GetBaseScreen()->BlockLocate;



    if( (Block->m_Command != BLOCK_IDLE)

       || ( Block->m_State != STATE_NO_BLOCK) )
@@ -169,7 +169,7 @@ bool WinEDA_DrawFrame::HandleBlockBegin( wxDC* DC, int key, 
        if( Block->m_BlockDrawStruct == NULL )      /* No data to paste */

        {

            DisplayError( this, wxT( "No Block to paste" ), 20 );

            GetScreen()->BlockLocate.m_Command = BLOCK_IDLE;

            GetBaseScreen()->BlockLocate.m_Command = BLOCK_IDLE;

            DrawPanel->ManageCurseur = NULL;

            return TRUE;

        }

common/copy_to_clipboard.cpp

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ void WinEDA_DrawFrame::CopyToClipboard( wxCommandEvent& event ) 


    if(  event.GetId() == ID_GEN_COPY_BLOCK_TO_CLIPBOARD )

    {

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

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

            DrawPanel->SetCursor( wxCursor( DrawPanel->m_PanelCursor =

                        DrawPanel->m_PanelDefaultCursor ) );

common/worksheet.cpp

+2 −2
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ wxString WinEDA_DrawFrame::GetScreenDesc() 
{

    wxString msg;



    msg << GetScreen()->m_ScreenNumber << wxT( "/" ) <<

    GetScreen()->m_NumberOfScreen;

    msg << GetBaseScreen()->m_ScreenNumber << wxT( "/" )

        << GetBaseScreen()->m_NumberOfScreen;

    return msg;

}

cvpcb/cvstruct.h

+135 −135
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ public: 
    wxString    OnGetItemText( long item, long column ) const;

    void        OnLeftClick( wxListEvent& event );

    void        OnLeftDClick( wxListEvent& event );



    DECLARE_EVENT_TABLE()

};
@@ -208,4 +209,3 @@ public: 




#endif  //#ifndef CVSTRUCT_H