find position bug fixed

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

diff --git a/user/wxLayout/wxLayout.cpp b/user/wxLayout/wxLayout.cpp
index 504fef1d1f06d676aa6ee6be684b9910aa01a61b..ae08a6ce9b83d28659edf7de400093bf0dad3c62 100644 (file)
--- a/user/wxLayout/wxLayout.cpp
+++ b/user/wxLayout/wxLayout.cpp
@@ -11,14 +11,17 @@
 #pragma implementation "wxLayout.h"
 #endif
 
 #pragma implementation "wxLayout.h"
 #endif
 

+#include "wx/wxprec.h"
+#ifdef __BORLANDC__
+#  pragma hdrstop
+#endif
+

 #include "wxLayout.h"
 #include "wx/textfile.h"
 
 
 #include   "Micon.xpm"
 
 #include "wxLayout.h"
 #include "wx/textfile.h"
 
 
 #include   "Micon.xpm"
 

-// for testing only:
-#include   <stdio.h>

 
 //-----------------------------------------------------------------------------
 // main program
 
 //-----------------------------------------------------------------------------
 // main program


@@ -33,8 +36,9 @@ 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,
    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_WXLAYOUT_DEBUG, ID_QUIT, ID_CLICK, ID_HTML, ID_TEXT, ID_TEST };
+             ID_WRAP, ID_NOWRAP, ID_PASTE, ID_COPY, ID_CUT, ID_FIND,
+             ID_WXLAYOUT_DEBUG, ID_QUIT, ID_CLICK, ID_HTML, ID_TEXT,
+             ID_TEST, ID_LONG_TEST };

 
 
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
 
 
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )


@@ -54,8 +58,6 @@ IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
    END_EVENT_TABLE()
 
 
    END_EVENT_TABLE()
 
 

-   int orientation = wxPORTRAIT;
-

 MyFrame::MyFrame(void) :
    wxFrame( (wxFrame *) NULL, -1, (char *) "wxLayout", wxPoint(20,20), wxSize(600,360) )
 {
 MyFrame::MyFrame(void) :
    wxFrame( (wxFrame *) NULL, -1, (char *) "wxLayout", wxPoint(20,20), wxSize(600,360) )
 {


@@ -63,10 +65,9 @@ MyFrame::MyFrame(void) :
   
    SetStatusText( "wxLayout by Karsten Ballüder." );
 
   
    SetStatusText( "wxLayout by Karsten Ballüder." );
 

+   wxMenuBar *menu_bar = new wxMenuBar();
+   

    wxMenu *file_menu = new wxMenu;
    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");
    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 +79,26 @@ 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->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");
    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" );
 
    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->Append( ID_LONG_TEST, "Add many lines");
+   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_COPY, "Copy", "Copy text to clipboard.");
+   edit_menu->Append(ID_CUT, "Cut", "Cut text to clipboard.");
+   edit_menu->Append(ID_PASTE,"Paste", "Paste text from clipboard.");
+   edit_menu->Append(ID_FIND, "Find", "Find text.");
+   menu_bar->Append(edit_menu, "Edit" );
+

 #ifndef __WXMSW__
    menu_bar->Show( TRUE );
 #endif // MSW
 #ifndef __WXMSW__
    menu_bar->Show( TRUE );
 #endif // MSW


@@ -99,6 +108,7 @@ MyFrame::MyFrame(void) :
    m_lwin = new wxLayoutWindow(this);
    m_lwin->SetMouseTracking(true);
    m_lwin->SetEditable(true);
    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();
 };
    m_lwin->Clear(wxROMAN,16,wxNORMAL,wxNORMAL, false);
    m_lwin->SetFocus();
 };


@@ -133,14 +143,13 @@ MyFrame::AddSampleText(wxLayoutList *llist)
    llist->Insert("italics ");
    llist->SetFont(-1,-1,wxNORMAL);
    llist->LineBreak();
    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,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");
    llist->Insert("and ");
    llist->SetFont(-1,-1,-1,-1,-1,"blue");
    llist->Insert("blue");


@@ -211,8 +220,7 @@ void MyFrame::OnCommand( wxCommandEvent &event )
    break;
    case ID_NOWRAP:
    case ID_WRAP:
    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());
       break;
    case ID_ADD_SAMPLE:
       AddSampleText(m_lwin->GetLayoutList());


@@ -223,12 +231,29 @@ void MyFrame::OnCommand( wxCommandEvent &event )
    case ID_CLICK:
       cerr << "Received click event." << endl;
       break;
    case ID_CLICK:
       cerr << "Received click event." << endl;
       break;

+   case ID_PASTE:
+      m_lwin->Paste();
+      m_lwin->Refresh(FALSE);
+      break;
+   case ID_COPY:
+      m_lwin->Copy();
+      m_lwin->Refresh(FALSE);
+      break;
+   case ID_CUT:
+      m_lwin->Cut();
+      m_lwin->Refresh(FALSE);
+      break;
+   case ID_FIND:
+      m_lwin->Find("void");
+      m_lwin->Refresh(FALSE);
+      break;

    case ID_HTML:
    {
       wxLayoutExportObject *export;
       wxLayoutExportStatus status(m_lwin->GetLayoutList());
 
    case ID_HTML:
    {
       wxLayoutExportObject *export;
       wxLayoutExportStatus status(m_lwin->GetLayoutList());
 

-      while((export = wxLayoutExport( &status, WXLO_EXPORT_AS_HTML)) != NULL)
+      while((export = wxLayoutExport( &status,
+                                      WXLO_EXPORT_AS_HTML)) != NULL)

       {
          if(export->type == WXLO_EXPORT_HTML)
             cout << *(export->content.text);
       {
          if(export->type == WXLO_EXPORT_HTML)
             cout << *(export->content.text);


@@ -253,6 +278,21 @@ void MyFrame::OnCommand( wxCommandEvent &event )
       }
    }
    break;
       }
    }
    break;

+   case ID_LONG_TEST:
+   {
+      wxString line;
+      wxLayoutList *llist = m_lwin->GetLayoutList();
+      for(int i = 1; i < 5000; i++)
+      {
+         line.Printf("This is line number %d.", i);
+         llist->Insert(line);
+         llist->LineBreak();
+      }
+      llist->MoveCursorTo(wxPoint(0,0));
+      m_lwin->SetDirty();
+      m_lwin->Refresh();
+      break;
+   }

    }
 };
 
    }
 };
 


@@ -275,9 +315,11 @@ void MyFrame::OnPrintPS(wxCommandEvent& WXUNUSED(event))
 {
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 
 {
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 

+#ifdef OS_UNIX

    wxPostScriptPrinter printer;
    wxLayoutPrintout printout( m_lwin->GetLayoutList(),"My printout");
    printer.Print(this, &printout, TRUE);
    wxPostScriptPrinter printer;
    wxLayoutPrintout printout( m_lwin->GetLayoutList(),"My printout");
    printer.Print(this, &printout, TRUE);

+#endif

 }
 
 void MyFrame::OnPrintPreview(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnPrintPreview(wxCommandEvent& WXUNUSED(event))


@@ -288,7 +330,6 @@ void MyFrame::OnPrintPreview(wxCommandEvent& WXUNUSED(event))
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 #endif
    wxPrintData printData;
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 #endif
    wxPrintData printData;

-   printData.SetOrientation(orientation);

 
    // Pass two printout objects: for preview, and possible printing.
    wxPrintPreview *preview = new wxPrintPreview(new
 
    // Pass two printout objects: for preview, and possible printing.
    wxPrintPreview *preview = new wxPrintPreview(new


@@ -312,7 +353,6 @@ void MyFrame::OnPrintPreviewPS(wxCommandEvent& WXUNUSED(event))
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 
    wxPrintData printData;
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 
    wxPrintData printData;

-   printData.SetOrientation(orientation);

 
    // Pass two printout objects: for preview, and possible printing.
    wxPrintPreview *preview = new wxPrintPreview(new wxLayoutPrintout( m_lwin->GetLayoutList()), new wxLayoutPrintout( m_lwin->GetLayoutList()), & printData);
 
    // Pass two printout objects: for preview, and possible printing.
    wxPrintPreview *preview = new wxPrintPreview(new wxLayoutPrintout( m_lwin->GetLayoutList()), new wxLayoutPrintout( m_lwin->GetLayoutList()), & printData);


@@ -324,23 +364,13 @@ void MyFrame::OnPrintPreviewPS(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
 {

-#ifdef __WXMSW__
+#ifdef OS_WIN

    wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
 #else
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 #endif
    wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
 #else
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 #endif

-   wxPrintData data;
-   data.SetOrientation(orientation);
-
-#ifdef __WXMSW__
-   wxPrintDialog printerDialog(this, & data);
-#else
-   wxGenericPrintDialog printerDialog(this, & data);
-#endif
-   printerDialog.GetPrintData().SetSetupDialog(TRUE);
+   wxPrintDialog printerDialog(this, & m_PrintData);

    printerDialog.ShowModal();
    printerDialog.ShowModal();

-
-   orientation = printerDialog.GetPrintData().GetOrientation();

 }
 
 void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))


@@ -351,7 +381,6 @@ void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 #endif
    wxPageSetupData data;
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 #endif
    wxPageSetupData data;

-   data.SetOrientation(orientation);

 
 #ifdef __WXMSW__
    wxPageSetupDialog pageSetupDialog(this, & data);
 
 #ifdef __WXMSW__
    wxPageSetupDialog pageSetupDialog(this, & data);


@@ -361,7 +390,6 @@ void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
    pageSetupDialog.ShowModal();
 
    data = pageSetupDialog.GetPageSetupData();
    pageSetupDialog.ShowModal();
 
    data = pageSetupDialog.GetPageSetupData();

-   orientation = data.GetOrientation();

 }
 
 void MyFrame::OnPrintSetupPS(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnPrintSetupPS(wxCommandEvent& WXUNUSED(event))


@@ -369,13 +397,13 @@ void MyFrame::OnPrintSetupPS(wxCommandEvent& WXUNUSED(event))
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 
    wxPrintData data;
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 
    wxPrintData data;

-   data.SetOrientation(orientation);

 
 

+#ifdef __WXMSW__
+   wxPrintDialog printerDialog(this, & data);
+#else

    wxGenericPrintDialog printerDialog(this, & data);
    wxGenericPrintDialog printerDialog(this, & data);

-   printerDialog.GetPrintData().SetSetupDialog(TRUE);
+#endif

    printerDialog.ShowModal();
    printerDialog.ShowModal();

-
-   orientation = printerDialog.GetPrintData().GetOrientation();

 }
 
 void MyFrame::OnPageSetupPS(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnPageSetupPS(wxCommandEvent& WXUNUSED(event))


@@ -383,12 +411,12 @@ void MyFrame::OnPageSetupPS(wxCommandEvent& WXUNUSED(event))
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 
    wxPageSetupData data;
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 
    wxPageSetupData data;

-   data.SetOrientation(orientation);
-
+#ifdef __WXMSW__
+   wxPageSetupDialog pageSetupDialog(this, & data);
+#else

    wxGenericPageSetupDialog pageSetupDialog(this, & data);
    wxGenericPageSetupDialog pageSetupDialog(this, & data);

+#endif

    pageSetupDialog.ShowModal();
    pageSetupDialog.ShowModal();

-
-   orientation = pageSetupDialog.GetPageSetupData().GetOrientation();

 }
 
 
 }