hotkey fix for + and -

Doxyfile

@@ -466,7 +466,9 @@ INPUT                  = kicad \
                          common \
                          gerbview \
                          share \
-                         include
+                         include \
+                         polygon
+                         
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 

change_log.txt

@@ -4,6 +4,16 @@ Started 2007-June-11
 Please add newer entries at the top, list the date and your name with
 email address.
 
+
+2007-Dec-11 UPDATE   Dick Hollenbeck <dick@softplc.com>
+================================================================================
++all
+  * Fixed hotkey table for '+' and '-' bug.  The lookup table in 
+    common/hotkeys_basic.cpp had bad entries for + and -.  These hotkeys
+    were not working on Linux.
+  * Added polygon directory to Doxyfile.
+
+
 2007-Dec-09 UPDATE  Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
 ================================================================================
 +cvpcb:
@@ -14,25 +24,24 @@ email address.
 2007-Dec-09 UPDATE  Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
 ================================================================================
 +pcbnew:
-	changes in file organisation and classes to prepare zone redesign. No real new code.
+    changes in file organisation and classes to prepare zone redesign. No real new code.
-	class zone functions and definitions moved in class_zone.h and .cpp
+    class zone functions and definitions moved in class_zone.h and .cpp
 
 
 2007-Dec-07 UPDATE  Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
 ================================================================================
 +pcbnew
-	Very minor bug in drill map : inaccurate via shapes (I believe EXCELLON drill file has no problems)
+    Very minor bug in drill map : inaccurate via shapes (I believe EXCELLON drill file has no problems)
-
 
     
 2007-Dec-06 UPDATE  Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
 ================================================================================
 +all
-	Solved zoom key command problems (under linux and windows)
+    Solved zoom key command problems (under linux and windows)
-	(seen http://sourceforge.net/tracker/index.php?func=detail&aid=1844960&group_id=145591&atid=762476)
+    (seen http://sourceforge.net/tracker/index.php?func=detail&aid=1844960&group_id=145591&atid=762476)
-	
+    
 +pcbnew
-	solved bug when loading a footprint in modedit: invisible text attribute was lost (trunk and tag)
+    solved bug when loading a footprint in modedit: invisible text attribute was lost (trunk and tag)
 
 
 2007-Dec-4 UPDATE   Dick Hollenbeck <dick@softplc.com>
@@ -63,7 +72,7 @@ email address.
 ================================================================================
 +eeschema:
     Solved an annotation problem: in multiple parts per package components,
-	when sorted by position, parts were not grouped by package.
+    when sorted by position, parts were not grouped by package.
 
 
 2007-Dec-2 UPDATE   Dick Hollenbeck <dick@softplc.com>

common/hotkeys_basic.cpp

@@ -61,8 +61,8 @@ static struct hotkey_name_descr s_Hotkey_Name_List[] =
     { wxT( "End" ),       WXK_END          },
     { wxT( "Page Up" ),   WXK_PAGEUP       },
     { wxT( "Page Down" ), WXK_PAGEDOWN     },
-    { wxT( "+" ),         WXK_ADD          },
+    { wxT( "+" ),         '+'              },
-    { wxT( "-" ),         WXK_SUBTRACT     },
+    { wxT( "-" ),         '-'              },
 
     { wxT( "Up" ),        WXK_UP           },
     { wxT( "Down" ),      WXK_DOWN         },
@@ -273,6 +273,7 @@ static int ReturnKeyCodeFromKeyName( const wxString& keyname )
     {
         if( s_Hotkey_Name_List[ii].m_KeyCode == 0 )  // End of list reached
             break;
+        
         if( keyname.CmpNoCase( s_Hotkey_Name_List[ii].m_Name ) == 0 )
         {
             keycode = s_Hotkey_Name_List[ii].m_KeyCode;
@@ -542,10 +543,13 @@ int WinEDA_BasicFrame::ReadHotkeyConfigFile( const wxString&
         /* Get the key name */
         strtok( NULL, "\"\n\r" );
         keyname = strtok( NULL, "\"\n\r" );
+        
         strtok( NULL, "\"\n\r" );
+        
         /* Get the command name */
         fctname = strtok( NULL, "\"\n\r" );
         msg = CONV_FROM_UTF8( fctname );
+        
         /* search the hotkey in current hotkey list */
         for( Ki_HotkeyInfo** List = CurrentHotkeyList; *List != NULL; List++ )
         {
@@ -553,9 +557,11 @@ int WinEDA_BasicFrame::ReadHotkeyConfigFile( const wxString&
             if( hk_decr->m_InfoMsg == msg )
             {
                 msg = CONV_FROM_UTF8( keyname );
+                
                 int code = ReturnKeyCodeFromKeyName( msg );
                 if( code )
                     hk_decr->m_KeyCode = code;
+                
                 break;
             }
         }

pcbnew/hotkeys.cpp

@@ -187,9 +187,12 @@ void WinEDA_PcbFrame::OnHotKey( wxDC* DC, int hotkey,
         hotkey += 'A' - 'a';
 
     Ki_HotkeyInfo * HK_Descr = GetDescriptorFromHotkey( hotkey, s_Common_Hotkey_List );
+    
     if( HK_Descr == NULL )
         HK_Descr = GetDescriptorFromHotkey( hotkey, s_board_edit_Hotkey_List );
-    if( HK_Descr == NULL ) return;
+    
+    if( HK_Descr == NULL ) 
+        return;
 
     int ll;
 

pcbnew/tool_pcb.cpp

@@ -620,7 +620,7 @@ WinEDAChoiceBox* WinEDA_PcbFrame::ReCreateLayerBox( WinEDA_Toolbar* parent )
         if( parent == NULL )
             return NULL;
         m_SelLayerBox = new WinEDAChoiceBox( parent, ID_TOOLBARH_PCB_SELECT_LAYER,
-                                            wxPoint( -1, -1 ), wxSize( LISTBOX_WIDTH, -1 ) );
+                                            wxPoint( -1, -1 ), wxSize( -1, -1 ) );
         parent->AddControl( m_SelLayerBox );
     }