Merged in latest wxLayout code from Mahogany Mail.

[wxWidgets.git] / user / wxLayout / wxLayout.cpp

diff --git a/user/wxLayout/wxLayout.cpp b/user/wxLayout/wxLayout.cpp
index 880a1dd6903dc9ee2ef3cb6fdc257eba402b703e..fe8fa471eed7e3930e9bda991e7393bffa577010 100644 (file)
--- a/user/wxLayout/wxLayout.cpp
+++ b/user/wxLayout/wxLayout.cpp
@@ -33,7 +33,7 @@ IMPLEMENT_APP(MyApp)
    enum ids{ ID_ADD_SAMPLE = 1, ID_CLEAR, ID_PRINT,
              ID_PRINT_SETUP, ID_PAGE_SETUP, ID_PREVIEW, ID_PRINT_PS,
              ID_PRINT_SETUP_PS, ID_PAGE_SETUP_PS,ID_PREVIEW_PS,
-             ID_WRAP, ID_NOWRAP,
+             ID_WRAP, ID_NOWRAP, ID_PASTE,
              ID_WXLAYOUT_DEBUG, ID_QUIT, ID_CLICK, ID_HTML, ID_TEXT, ID_TEST };
 
 
@@ -63,10 +63,9 @@ MyFrame::MyFrame(void) :
   
    SetStatusText( "wxLayout by Karsten Ballüder." );
 
+   wxMenuBar *menu_bar = new wxMenuBar();
+   
    wxMenu *file_menu = new wxMenu;
-   file_menu->Append( ID_CLEAR, "Clear");
-   file_menu->Append( ID_ADD_SAMPLE, "Example");
-
    file_menu->Append(ID_PRINT, "&Print...", "Print");
    file_menu->Append(ID_PRINT_SETUP, "Print &Setup...","Setup printer properties");
    file_menu->Append(ID_PAGE_SETUP, "Page Set&up...", "Page setup");
@@ -78,18 +77,22 @@ MyFrame::MyFrame(void) :
    file_menu->Append(ID_PAGE_SETUP_PS, "Page Setup PostScript...", "Page setup (PostScript)");
    file_menu->Append(ID_PREVIEW_PS, "Print Preview PostScript", "Preview (PostScript)");
 #endif
-   file_menu->AppendSeparator();
-   file_menu->Append(ID_WRAP, "Wrap mode", "Activate wrapping at pixel 200.");
-   file_menu->Append(ID_NOWRAP, "No-wrap mode", "Deactivate wrapping.");
-
    file_menu->AppendSeparator();
    file_menu->Append( ID_TEXT, "Export Text");
    file_menu->Append( ID_HTML, "Export HTML");
    file_menu->Append( ID_QUIT, "Exit");
-  
-   wxMenuBar *menu_bar = new wxMenuBar();
    menu_bar->Append(file_menu, "File" );
 
+   wxMenu *edit_menu = new wxMenu;
+   edit_menu->Append( ID_CLEAR, "Clear");
+   edit_menu->Append( ID_ADD_SAMPLE, "Example");
+   edit_menu->AppendSeparator();
+   edit_menu->Append(ID_WRAP, "Wrap mode", "Activate wrapping at pixel 200.");
+   edit_menu->Append(ID_NOWRAP, "No-wrap mode", "Deactivate wrapping.");
+   edit_menu->AppendSeparator();
+   edit_menu->Append(ID_PASTE, "Paste", "Paste text from clipboard.");
+   menu_bar->Append(edit_menu, "Edit" );
+
 #ifndef __WXMSW__
    menu_bar->Show( TRUE );
 #endif // MSW
@@ -99,6 +102,7 @@ MyFrame::MyFrame(void) :
    m_lwin = new wxLayoutWindow(this);
    m_lwin->SetMouseTracking(true);
    m_lwin->SetEditable(true);
+   m_lwin->SetWrapMargin(40);
    m_lwin->Clear(wxROMAN,16,wxNORMAL,wxNORMAL, false);
    m_lwin->SetFocus();
 };
@@ -133,14 +137,13 @@ MyFrame::AddSampleText(wxLayoutList *llist)
    llist->Insert("italics ");
    llist->SetFont(-1,-1,wxNORMAL);
    llist->LineBreak();
-  
+   
    llist->Insert("and ");
    llist->SetFont(-1,-1,wxSLANT);
    llist->Insert("slanted");
    llist->SetFont(-1,-1,wxNORMAL);
    llist->Insert(" text.");
    llist->LineBreak();
-
    llist->Insert("and ");
    llist->SetFont(-1,-1,-1,-1,-1,"blue");
    llist->Insert("blue");
@@ -211,8 +214,7 @@ void MyFrame::OnCommand( wxCommandEvent &event )
    break;
    case ID_NOWRAP:
    case ID_WRAP:
-////      m_lwin->GetLayoutList()->SetWrapMargin(
-////         event.GetId() == ID_NOWRAP ? -1 : 40);
+      m_lwin->SetWrapMargin(event.GetId() == ID_NOWRAP ? 0 : 40);
       break;
    case ID_ADD_SAMPLE:
       AddSampleText(m_lwin->GetLayoutList());
@@ -223,6 +225,9 @@ void MyFrame::OnCommand( wxCommandEvent &event )
    case ID_CLICK:
       cerr << "Received click event." << endl;
       break;
+   case ID_PASTE:
+      m_lwin->Paste();
+      break;
    case ID_HTML:
    {
       wxLayoutExportObject *export;