1. some more tests in console

[wxWidgets.git] / src / generic / proplist.cpp

diff --git a/src/generic/proplist.cpp b/src/generic/proplist.cpp
index af0a32a664072996fcedbc5057fde0ab12e723b3..d5f5dcd9c4294753507fa5e6c7be587b083d7470 100644 (file)
--- a/src/generic/proplist.cpp
+++ b/src/generic/proplist.cpp
@@ -72,7 +72,7 @@ static wxBitmap *GetCrossBitmap();
 // Property text edit control
 // ----------------------------------------------------------------------------
 
 // Property text edit control
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_CLASS(wxPropertyTextEdit, wxTextCtrl)
+IMPLEMENT_DYNAMIC_CLASS(wxPropertyTextEdit, wxTextCtrl)

 
 wxPropertyTextEdit::wxPropertyTextEdit(wxPropertyListView *v, wxWindow *parent,
     const wxWindowID id, const wxString& value,
 
 wxPropertyTextEdit::wxPropertyTextEdit(wxPropertyListView *v, wxWindow *parent,
     const wxWindowID id, const wxString& value,


@@ -420,7 +420,7 @@ bool wxPropertyListView::CreateControls()
 {
     wxPanel *panel = (wxPanel *)m_propertyWindow;
 
 {
     wxPanel *panel = (wxPanel *)m_propertyWindow;
 

-    wxSize largeButtonSize( 60, 25 );
+    wxSize largeButtonSize( 70, 25 );

     wxSize smallButtonSize( 23, 23 );
 
     if (m_valueText)
     wxSize smallButtonSize( 23, 23 );
 
     if (m_valueText)


@@ -511,7 +511,7 @@ bool wxPropertyListView::CreateControls()
             m_windowCloseButton = new wxButton(panel, wxID_OK, _("OK"), wxPoint(-1, -1), largeButtonSize );
             m_windowCloseButton->SetDefault();
             m_windowCloseButton->SetFocus();
             m_windowCloseButton = new wxButton(panel, wxID_OK, _("OK"), wxPoint(-1, -1), largeButtonSize );
             m_windowCloseButton->SetDefault();
             m_windowCloseButton->SetFocus();

-            bottomsizer->Add( m_windowCloseButton, 0, wxLEFT|wxTOP|wxBOTTOM, buttonborder );
+            bottomsizer->Add( m_windowCloseButton, 0, wxALL, buttonborder );

         }
         else if (m_buttonFlags & wxPROP_BUTTON_CLOSE)
         {
         }
         else if (m_buttonFlags & wxPROP_BUTTON_CLOSE)
         {


@@ -529,7 +529,7 @@ bool wxPropertyListView::CreateControls()
             bottomsizer->Add( m_windowHelpButton, 0, wxALL, buttonborder );
         }
 
             bottomsizer->Add( m_windowHelpButton, 0, wxALL, buttonborder );
         }
 

-        mainsizer->Add( bottomsizer, 1, wxALIGN_RIGHT | wxEXPAND );
+        mainsizer->Add( bottomsizer, 0, wxALIGN_RIGHT | wxEXPAND );

     }
 
     panel->SetSizer( mainsizer );
     }
 
     panel->SetSizer( mainsizer );


@@ -675,7 +675,7 @@ void wxPropertyListView::OnText(wxCommandEvent& event)
 // Property dialog box
 // ----------------------------------------------------------------------------
 
 // Property dialog box
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_CLASS(wxPropertyListDialog, wxDialog)
+IMPLEMENT_DYNAMIC_CLASS(wxPropertyListDialog, wxDialog)

 
 BEGIN_EVENT_TABLE(wxPropertyListDialog, wxDialog)
     EVT_BUTTON(wxID_CANCEL,                wxPropertyListDialog::OnCancel)
 
 BEGIN_EVENT_TABLE(wxPropertyListDialog, wxDialog)
     EVT_BUTTON(wxID_CANCEL,                wxPropertyListDialog::OnCancel)


@@ -735,7 +735,7 @@ bool wxPropertyListDialog::ProcessEvent(wxEvent& event)
 // Property panel
 // ----------------------------------------------------------------------------
 
 // Property panel
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_CLASS(wxPropertyListPanel, wxPanel)
+IMPLEMENT_DYNAMIC_CLASS(wxPropertyListPanel, wxPanel)

 
 BEGIN_EVENT_TABLE(wxPropertyListPanel, wxPanel)
     EVT_SIZE(wxPropertyListPanel::OnSize)
 
 BEGIN_EVENT_TABLE(wxPropertyListPanel, wxPanel)
     EVT_SIZE(wxPropertyListPanel::OnSize)


@@ -771,7 +771,7 @@ void wxPropertyListPanel::OnSize(wxSizeEvent& WXUNUSED(event))
 // Property frame
 // ----------------------------------------------------------------------------
 
 // Property frame
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_CLASS(wxPropertyListFrame, wxFrame)
+IMPLEMENT_DYNAMIC_CLASS(wxPropertyListFrame, wxFrame)

 
 BEGIN_EVENT_TABLE(wxPropertyListFrame, wxFrame)
     EVT_CLOSE(wxPropertyListFrame::OnCloseWindow)
 
 BEGIN_EVENT_TABLE(wxPropertyListFrame, wxFrame)
     EVT_CLOSE(wxPropertyListFrame::OnCloseWindow)


@@ -1851,7 +1851,7 @@ static wxBitmap *GetTickBitmap()
     {
         s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
 
     {
         s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
 

-        #if defined(__WXMSW__) || defined(__WXOS2__)
+        #if defined(__WXMSW__) || defined(__WXPM__)

             s_tickBitmap = new wxBitmap("tick_bmp", wxBITMAP_TYPE_RESOURCE);
         #else
             s_tickBitmap = new wxBitmap( tick_xpm );
             s_tickBitmap = new wxBitmap("tick_bmp", wxBITMAP_TYPE_RESOURCE);
         #else
             s_tickBitmap = new wxBitmap( tick_xpm );


@@ -1870,7 +1870,7 @@ static wxBitmap *GetCrossBitmap()
     {
         s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
 
     {
         s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
 

-        #if defined(__WXMSW__) || defined(__WXOS2__)
+        #if defined(__WXMSW__) || defined(__WXPM__)

             s_crossBitmap =  new wxBitmap("cross_bmp", wxBITMAP_TYPE_RESOURCE);
         #else // XPMs
             s_crossBitmap =  new wxBitmap( cross_xpm );
             s_crossBitmap =  new wxBitmap("cross_bmp", wxBITMAP_TYPE_RESOURCE);
         #else // XPMs
             s_crossBitmap =  new wxBitmap( cross_xpm );