|
From: Emilien K. <cur...@us...> - 2005-01-10 15:39:18
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13616/src Modified Files: BitmapDocView.cpp Log Message: Ajout des menus correspondants aux styles de crayon et auc outils de dessins Index: BitmapDocView.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapDocView.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** BitmapDocView.cpp 10 Jan 2005 15:18:56 -0000 1.7 --- BitmapDocView.cpp 10 Jan 2005 15:38:57 -0000 1.8 *************** *** 173,195 **** #define ID_PEN_CTRL 104 ! #define ID_TOOL_NONE 200 ! #define ID_TOOL_HANDDRAW 201 ! #define ID_TOOL_BRUSH 202 ! #define ID_TOOL_SPRAY 203 ! #define ID_TOOL_LINE 204 ! #define ID_TOOL_RECT 205 ! #define ID_TOOL_ELLIPSE 206 ! #define ID_TOOL_RRECT 207 #define ID_TOOL_FIRST ID_TOOL_NONE #define ID_TOOL_LAST ID_TOOL_RRECT ! #define ID_PEN_SIZE 250 ! #define ID_PEN_SOLID 260 ! #define ID_PEN_TRANSPARENT 261 ! #define ID_PEN_DOT 262 ! #define ID_PEN_LONG_DASH 263 ! #define ID_PEN_SHORT_DASH 264 ! #define ID_PEN_DOT_DASH 265 #define ID_PEN_STYLE_FIRST ID_PEN_SOLID --- 173,195 ---- #define ID_PEN_CTRL 104 ! #define ID_TOOL_NONE (IDM_VIEW_MIN + 200) ! #define ID_TOOL_HANDDRAW (IDM_VIEW_MIN + 201) ! #define ID_TOOL_BRUSH (IDM_VIEW_MIN + 202) ! #define ID_TOOL_SPRAY (IDM_VIEW_MIN + 203) ! #define ID_TOOL_LINE (IDM_VIEW_MIN + 204) ! #define ID_TOOL_RECT (IDM_VIEW_MIN + 205) ! #define ID_TOOL_ELLIPSE (IDM_VIEW_MIN + 206) ! #define ID_TOOL_RRECT (IDM_VIEW_MIN + 207) #define ID_TOOL_FIRST ID_TOOL_NONE #define ID_TOOL_LAST ID_TOOL_RRECT ! #define ID_PEN_SIZE (IDM_VIEW_MIN + 250) ! #define ID_PEN_SOLID (IDM_VIEW_MIN + 260) ! #define ID_PEN_TRANSPARENT (IDM_VIEW_MIN + 261) ! #define ID_PEN_DOT (IDM_VIEW_MIN + 262) ! #define ID_PEN_LONG_DASH (IDM_VIEW_MIN + 263) ! #define ID_PEN_SHORT_DASH (IDM_VIEW_MIN + 264) ! #define ID_PEN_DOT_DASH (IDM_VIEW_MIN + 265) #define ID_PEN_STYLE_FIRST ID_PEN_SOLID *************** *** 231,237 **** --- 231,239 ---- EVT_UPDATE_UI_RANGE(ID_TOOL_FIRST, ID_TOOL_LAST, BitmapView::OnUpdateTools) EVT_TOOL_RANGE(ID_TOOL_FIRST, ID_TOOL_LAST, BitmapView::OnTool) + EVT_MENU_RANGE(ID_TOOL_FIRST, ID_TOOL_LAST, BitmapView::OnTool) EVT_UPDATE_UI_RANGE(ID_PEN_STYLE_FIRST, ID_PEN_STYLE_LAST, BitmapView::OnUpdatePenStyle) EVT_TOOL_RANGE(ID_PEN_STYLE_FIRST, ID_PEN_STYLE_LAST, BitmapView::OnPenStyle) + EVT_MENU_RANGE(ID_PEN_STYLE_FIRST, ID_PEN_STYLE_LAST, BitmapView::OnPenStyle) EVT_TEXT(ID_PEN_SIZE, BitmapView::OnPenSizeChange) *************** *** 246,253 **** --- 248,275 ---- { wxMenu *pMenu; + + pMenu = new wxMenu(); + pMenu->AppendCheckItem(ID_TOOL_HANDDRAW , WXDC_BITMAP_MENU_TOOLS_HANDDRAW); + pMenu->AppendCheckItem(ID_TOOL_LINE , WXDC_BITMAP_MENU_TOOLS_LINE); + pMenu->AppendCheckItem(ID_TOOL_RECT , WXDC_BITMAP_MENU_TOOLS_RECT); + pMenu->AppendCheckItem(ID_TOOL_RRECT , WXDC_BITMAP_MENU_TOOLS_RRECT); + pMenu->AppendCheckItem(ID_TOOL_ELLIPSE , WXDC_BITMAP_MENU_TOOLS_ELLIPSE); + m_aMenu.Append(pMenu, WXDC_BITMAP_MENU_TOOLS); + + pMenu = new wxMenu(); + pMenu->AppendCheckItem(ID_PEN_SOLID , WXDC_BITMAP_MENU_PEN_SOLID ); + pMenu->AppendCheckItem(ID_PEN_TRANSPARENT , WXDC_BITMAP_MENU_PEN_TRANSPARENT); + pMenu->AppendCheckItem(ID_PEN_DOT , WXDC_BITMAP_MENU_PEN_DOT ); + pMenu->AppendCheckItem(ID_PEN_LONG_DASH , WXDC_BITMAP_MENU_PEN_LONG_DASH ); + pMenu->AppendCheckItem(ID_PEN_SHORT_DASH , WXDC_BITMAP_MENU_PEN_SHORT_DASH ); + pMenu->AppendCheckItem(ID_PEN_DOT_DASH , WXDC_BITMAP_MENU_PEN_DOT_DASH ); + m_aMenu.Append(pMenu, WXDC_BITMAP_MENU_PEN); + + pMenu = new wxMenu(); pMenu->AppendCheckItem(IDM_VIEW_EXTRASCROLL, WXDC_BITMAP_MENU_VIEW_EXTRASCROLL); pMenu->Append(IDM_VIEW_CENTER, WXDC_BITMAP_MENU_VIEW_CENTER); m_aMenu.Append(pMenu, WXDC_BITMAP_MENU_VIEW); + } |