find position bug fixed

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

diff --git a/user/wxLayout/wxLayout.cpp b/user/wxLayout/wxLayout.cpp
index 41e3392c61b4be246d9ddc9f6f5828242a6e8fd2..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


@@ -30,110 +33,148 @@ IMPLEMENT_APP(MyApp)
 // MyFrame
 //-----------------------------------------------------------------------------
 
 // MyFrame
 //-----------------------------------------------------------------------------
 

-   enum ids{ ID_EDIT = 1, ID_ADD_SAMPLE, ID_CLEAR, ID_PRINT, ID_DPRINT,
-             ID_WXLAYOUT_DEBUG, ID_QUIT, ID_CLICK, ID_HTML, ID_TEXT };
+   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_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 )
 
    BEGIN_EVENT_TABLE(MyFrame,wxFrame)
 
 
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
 
    BEGIN_EVENT_TABLE(MyFrame,wxFrame)

+   EVT_MENU(ID_PRINT, MyFrame::OnPrint)
+   EVT_MENU(ID_PREVIEW, MyFrame::OnPrintPreview)
+   EVT_MENU(ID_PRINT_SETUP, MyFrame::OnPrintSetup)
+   EVT_MENU(ID_PAGE_SETUP, MyFrame::OnPageSetup)
+   EVT_MENU(ID_PRINT_PS, MyFrame::OnPrintPS)
+   EVT_MENU(ID_PREVIEW_PS, MyFrame::OnPrintPreviewPS)
+   EVT_MENU(ID_PRINT_SETUP_PS, MyFrame::OnPrintSetupPS)
+   EVT_MENU(ID_PAGE_SETUP_PS, MyFrame::OnPageSetupPS)

    EVT_MENU    (-1,       MyFrame::OnCommand)
    EVT_COMMAND (-1,-1,    MyFrame::OnCommand)
    EVT_MENU    (-1,       MyFrame::OnCommand)
    EVT_COMMAND (-1,-1,    MyFrame::OnCommand)

-   EVT_CHAR    (wxLayoutWindow::OnChar)
+   EVT_CHAR    (  wxLayoutWindow::OnChar  )

    END_EVENT_TABLE()
 
    END_EVENT_TABLE()
 

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

 {
    CreateStatusBar( 1 );
   
    SetStatusText( "wxLayout by Karsten Ballüder." );
 
 {
    CreateStatusBar( 1 );
   
    SetStatusText( "wxLayout by Karsten Ballüder." );
 

-   wxMenu *file_menu = new wxMenu( "Menu 1" );
-   file_menu->Append( ID_CLEAR, "Clear");
-   file_menu->Append( ID_ADD_SAMPLE, "Example");
-   file_menu->Append( ID_EDIT, "Edit");
-   file_menu->Append( ID_WXLAYOUT_DEBUG, "Debug");
-   file_menu->Append( ID_PRINT, "Print");
-   file_menu->Append( ID_DPRINT, "Direct Print");
+   wxMenuBar *menu_bar = new wxMenuBar();
+   
+   wxMenu *file_menu = new wxMenu;
+   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_PREVIEW, "Print Pre&view", "Preview");
+#ifdef __WXMSW__
+   file_menu->AppendSeparator();
+   file_menu->Append(ID_PRINT_PS, "Print PostScript...", "Print (PostScript)");
+   file_menu->Append(ID_PRINT_SETUP_PS, "Print Setup PostScript...", "Setup printer properties (PostScript)");
+   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_TEXT, "Export Text");
    file_menu->Append( ID_HTML, "Export HTML");
    file_menu->Append( ID_QUIT, "Exit");
    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 );
    menu_bar->Show( TRUE );

+#endif // MSW

   
    SetMenuBar( menu_bar );
 
    m_lwin = new wxLayoutWindow(this);
   
    SetMenuBar( menu_bar );
 
    m_lwin = new wxLayoutWindow(this);

-   m_lwin->SetEventId(ID_CLICK);
-   m_lwin->GetLayoutList().SetEditable(true);
+   m_lwin->SetMouseTracking(true);
+   m_lwin->SetEditable(true);
+   m_lwin->SetWrapMargin(40);
+   m_lwin->Clear(wxROMAN,16,wxNORMAL,wxNORMAL, false);

    m_lwin->SetFocus();
 };
 
 void
    m_lwin->SetFocus();
 };
 
 void

-MyFrame::AddSampleText(wxLayoutList &llist)
+MyFrame::AddSampleText(wxLayoutList *llist)

 {
 {

-
-   llist.Clear(wxROMAN,16,wxNORMAL,wxNORMAL, false);
-
-   llist.Insert("The quick brown fox jumps over the lazy dog.");
-   llist.LineBreak();
-   llist.Insert("Hello ");
-   llist.Insert(new wxLayoutObjectIcon(new wxIcon(Micon_xpm,-1,-1)));
-   llist.LineBreak();
-   llist.SetFontWeight(wxBOLD);
-   llist.Insert("World! ");
-   llist.SetFontWeight(wxNORMAL);
-   llist.Insert("The quick brown fox jumps...");
-   llist.LineBreak();
-
-   llist.Insert("over the lazy dog.");
-   llist.SetFont(-1,-1,-1,-1,true);
-   llist.Insert("underlined");
-   llist.SetFont(-1,-1,-1,-1,false);
-   llist.SetFont(wxROMAN);
-   llist.Insert("This is ");
-   llist.SetFont(-1,-1,-1,wxBOLD);  llist.Insert("BOLD ");  llist.SetFont(-1,-1,-1,wxNORMAL);
-   llist.Insert("and ");
-   llist.SetFont(-1,-1,wxITALIC);
-   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");
-   llist.SetFont(-1,-1,-1,-1,-1,"black");
-   llist.Insert(" and ");
-   llist.SetFont(-1,-1,-1,-1,-1,"red","black");
-   llist.Insert("red on black");
-   llist.SetFont(-1,-1,-1,-1,-1,"black");
-   llist.Insert(" text.");
-   llist.LineBreak();
-
-   llist.SetFont(-1,-1,wxSLANT);
-   llist.Insert("Slanted");
-   llist.SetFont(-1,-1,wxNORMAL);
-   llist.Insert(" and normal text and ");
-   llist.SetFont(-1,-1,wxSLANT);
-   llist.Insert("slanted");
-   llist.SetFont(-1,-1,wxNORMAL);
-   llist.Insert(" again.");
-   llist.LineBreak();
+   llist->SetFont(wxROMAN,16,wxNORMAL,wxNORMAL, false);
+   llist->Insert("--");
+   llist->LineBreak();
+
+   llist->SetFont(wxROMAN);
+   llist->Insert("The quick brown fox jumps over the lazy dog.");
+   llist->LineBreak();
+   llist->Insert("Hello ");
+   llist->Insert(new wxLayoutObjectIcon(new wxICON(Micon)));
+   llist->SetFontWeight(wxBOLD);
+   llist->Insert("World! ");
+   llist->SetFontWeight(wxNORMAL);
+   llist->Insert("The quick brown fox jumps...");
+   llist->LineBreak();
+
+   llist->Insert("over the lazy dog.");
+   llist->SetFont(-1,-1,-1,-1,true);
+   llist->Insert("underlined");
+   llist->SetFont(-1,-1,-1,-1,false);
+   llist->SetFont(wxROMAN);
+   llist->Insert("This is ");
+   llist->SetFont(-1,-1,-1,wxBOLD);  llist->Insert("BOLD ");  llist->SetFont(-1,-1,-1,wxNORMAL);
+   llist->Insert("and ");
+   llist->SetFont(-1,-1,wxITALIC);
+   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");
+   llist->SetFont(-1,-1,-1,-1,-1,"black");
+   llist->Insert(" and ");
+   llist->SetFont(-1,-1,-1,-1,-1,"green","black");
+   llist->Insert("green on black");
+   llist->SetFont(-1,-1,-1,-1,-1,"black","white");
+   llist->Insert(" text.");
+   llist->LineBreak();
+
+   llist->SetFont(-1,-1,wxSLANT);
+   llist->Insert("Slanted");
+   llist->SetFont(-1,-1,wxNORMAL);
+   llist->Insert(" and normal text and ");
+   llist->SetFont(-1,-1,wxSLANT);
+   llist->Insert("slanted");
+   llist->SetFont(-1,-1,wxNORMAL);
+   llist->Insert(" again.");
+   llist->LineBreak();

 
    // add some more text for testing:
 
    // add some more text for testing:

-   llist.Insert("And here the source for the test program:");
-   llist.LineBreak();
-   llist.SetFont(wxTELETYPE,16);
+   llist->Insert("And here the source for the test program:");
+   llist->LineBreak();
+   llist->SetFont(wxTELETYPE,16);

    char buffer[1024];
    FILE *in = fopen("wxLayout.cpp","r");
    if(in)
    char buffer[1024];
    FILE *in = fopen("wxLayout.cpp","r");
    if(in)


@@ -143,64 +184,43 @@ MyFrame::AddSampleText(wxLayoutList &llist)
          fgets(buffer,1024,in);
          if(feof(in))
             break;
          fgets(buffer,1024,in);
          if(feof(in))
             break;

-         llist.Insert(buffer);
-         llist.LineBreak();
+         llist->Insert(buffer);
+         llist->LineBreak();

       }
    }
       }
    }

-
+   llist->MoveCursorTo(wxPoint(0,0));
+   m_lwin->SetDirty();

    m_lwin->Refresh();
    m_lwin->Refresh();

-   m_lwin->UpdateScrollbars();

 }
 
 void
 MyFrame::Clear(void)
 {
 }
 
 void
 MyFrame::Clear(void)
 {

-   m_lwin->Erase();
-   m_lwin->UpdateScrollbars();
+   m_lwin->Clear(wxROMAN,16,wxNORMAL,wxNORMAL, false);

 }
 
 }
 

-/* test the editing */
-void MyFrame::Edit(void)
-{
-   wxLayoutList & llist = m_lwin->GetLayoutList();
-   m_lwin->SetEventId(ID_CLICK);
-  
-   llist.MoveCursor(0);
-   llist.MoveCursor(5);
-   llist.MoveCursor(0,2);
-   llist.Delete(2);
-   llist.MoveCursor(2);
-   llist.Insert("not all so ");
-   llist.LineBreak();
-   m_lwin->Refresh();
-}

 
 void MyFrame::OnCommand( wxCommandEvent &event )
 {
 
 void MyFrame::OnCommand( wxCommandEvent &event )
 {

-   cerr << "id:" << event.GetId() << endl;

    switch (event.GetId())
    {
    case ID_QUIT:
       Close( TRUE );
       break;
    case ID_PRINT:
    switch (event.GetId())
    {
    case ID_QUIT:
       Close( TRUE );
       break;
    case ID_PRINT:

-      m_lwin->Print();
-      break;
-   case ID_DPRINT:

    {
    {

-      wxLayoutList llist;
-      AddSampleText(llist);
-      wxPostScriptDC   dc("layout.ps",true,this);
-      if (dc.Ok() && dc.StartDoc((char *)_("Printing message...")))
-      {
-         //dc.SetUserScale(1.0, 1.0);
-         llist.Draw(dc); //,false,wxPoint(0,0),true);
-         dc.EndDoc();
-      }
+      wxPrinter printer;
+      wxLayoutPrintout printout(m_lwin->GetLayoutList(),_("M: Printout"));
+      if (! printer.Print(this, &printout, TRUE))
+         wxMessageBox(                           
+            _("There was a problem with printing the message:\n"
+              "perhaps your current printer is not set up correctly?"),
+            _("Printing"), wxOK);

    }
    break;
    }
    break;

-   case ID_EDIT:
-      Edit();
+   case ID_NOWRAP:
+   case ID_WRAP:
+      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());


@@ -208,19 +228,32 @@ void MyFrame::OnCommand( wxCommandEvent &event )
    case ID_CLEAR:
       Clear();
       break;
    case ID_CLEAR:
       Clear();
       break;

-   case ID_WXLAYOUT_DEBUG:
-      m_lwin->GetLayoutList().Debug();
-      break;

    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;
    case ID_HTML:
    {
       wxLayoutExportObject *export;

-      wxLayoutList::iterator i = m_lwin->GetLayoutList().begin();
+      wxLayoutExportStatus status(m_lwin->GetLayoutList());

 
 

-      while((export = wxLayoutExport(m_lwin->GetLayoutList(),
-                                     i,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);


@@ -233,10 +266,9 @@ void MyFrame::OnCommand( wxCommandEvent &event )
    case ID_TEXT:
    {
       wxLayoutExportObject *export;
    case ID_TEXT:
    {
       wxLayoutExportObject *export;

-      wxLayoutList::iterator i = m_lwin->GetLayoutList().begin();
+      wxLayoutExportStatus status(m_lwin->GetLayoutList());

 
 

-      while((export = wxLayoutExport(m_lwin->GetLayoutList(),
-                                     i,WXLO_EXPORT_AS_TEXT)) != NULL)
+      while((export = wxLayoutExport( &status, WXLO_EXPORT_AS_TEXT)) != NULL)

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


@@ -246,9 +278,147 @@ 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;
+   }

    }
 };
 
    }
 };
 

+void MyFrame::OnPrint(wxCommandEvent& WXUNUSED(event))
+{
+#ifdef __WXMSW__
+   wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
+#else
+   wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+#endif
+   wxPrinter printer;
+   wxLayoutPrintout printout( m_lwin->GetLayoutList(),"Printout from wxLayout");
+   if (! printer.Print(this, &printout, TRUE))
+      wxMessageBox(
+         "There was a problem printing.\nPerhaps your current printer is not set correctly?",
+         "Printing", wxOK);  
+}
+
+void MyFrame::OnPrintPS(wxCommandEvent& WXUNUSED(event))
+{
+   wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+
+#ifdef OS_UNIX
+   wxPostScriptPrinter printer;
+   wxLayoutPrintout printout( m_lwin->GetLayoutList(),"My printout");
+   printer.Print(this, &printout, TRUE);
+#endif
+}
+
+void MyFrame::OnPrintPreview(wxCommandEvent& WXUNUSED(event))
+{
+#ifdef __WXMSW__
+   wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
+#else
+   wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+#endif
+   wxPrintData 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);  
+   if (!preview->Ok())
+   {
+      delete preview;
+      wxMessageBox("There was a problem previewing.\nPerhaps your current printer is not set correctly?", "Previewing", wxOK);
+      return;
+   }
+      
+   wxPreviewFrame *frame = new wxPreviewFrame(preview, this, "Demo Print Preview", wxPoint(100, 100), wxSize(600, 650));
+   frame->Centre(wxBOTH);
+   frame->Initialize();
+   frame->Show(TRUE);
+}
+
+void MyFrame::OnPrintPreviewPS(wxCommandEvent& WXUNUSED(event))
+{
+   wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+
+   wxPrintData 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);
+   wxPreviewFrame *frame = new wxPreviewFrame(preview, this, "Demo Print Preview", wxPoint(100, 100), wxSize(600, 650));
+   frame->Centre(wxBOTH);
+   frame->Initialize();
+   frame->Show(TRUE);
+}
+
+void MyFrame::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
+{
+#ifdef OS_WIN
+   wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
+#else
+   wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+#endif
+   wxPrintDialog printerDialog(this, & m_PrintData);
+   printerDialog.ShowModal();
+}
+
+void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
+{
+#ifdef __WXMSW__
+   wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
+#else
+   wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+#endif
+   wxPageSetupData data;
+
+#ifdef __WXMSW__
+   wxPageSetupDialog pageSetupDialog(this, & data);
+#else
+   wxGenericPageSetupDialog pageSetupDialog(this, & data);
+#endif
+   pageSetupDialog.ShowModal();
+
+   data = pageSetupDialog.GetPageSetupData();
+}
+
+void MyFrame::OnPrintSetupPS(wxCommandEvent& WXUNUSED(event))
+{
+   wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+
+   wxPrintData data;
+
+#ifdef __WXMSW__
+   wxPrintDialog printerDialog(this, & data);
+#else
+   wxGenericPrintDialog printerDialog(this, & data);
+#endif
+   printerDialog.ShowModal();
+}
+
+void MyFrame::OnPageSetupPS(wxCommandEvent& WXUNUSED(event))
+{
+   wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+
+   wxPageSetupData data;
+#ifdef __WXMSW__
+   wxPageSetupDialog pageSetupDialog(this, & data);
+#else
+   wxGenericPageSetupDialog pageSetupDialog(this, & data);
+#endif
+   pageSetupDialog.ShowModal();
+}
+

 
 //-----------------------------------------------------------------------------
 // MyApp
 
 //-----------------------------------------------------------------------------
 // MyApp


@@ -263,7 +433,7 @@ bool MyApp::OnInit(void)
 {
    wxFrame *frame = new MyFrame();
    frame->Show( TRUE );
 {
    wxFrame *frame = new MyFrame();
    frame->Show( TRUE );

-   wxSetAFMPath("/usr/local/src/wxWindows/misc/afm/");
+//   wxSetAFMPath("/usr/local/src/wxWindows/misc/afm/");

    return TRUE;
 };
 
    return TRUE;
 };