Include wx/checklst.h according to precompiled headers of wx/wx.h (with other minor cleaning).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-05-29 21:26:35 +00:00
parent 704eda0cdc
commit e6e839336c
9 changed files with 26 additions and 26 deletions

View File

@@ -13,10 +13,11 @@
#if wxUSE_CHECKLISTBOX #if wxUSE_CHECKLISTBOX
#include "wx/checklst.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/log.h" #include "wx/log.h"
#include "wx/app.h" #include "wx/app.h"
#include "wx/checklst.h"
#endif //WX_PRECOMP #endif //WX_PRECOMP
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)

View File

@@ -34,6 +34,7 @@
#include "wx/button.h" #include "wx/button.h"
#include "wx/listbox.h" #include "wx/listbox.h"
#include "wx/slider.h" #include "wx/slider.h"
#include "wx/checklst.h"
#endif #endif
#include "wx/spinctrl.h" #include "wx/spinctrl.h"
@@ -41,9 +42,6 @@
#if wxUSE_SPINBTN #if wxUSE_SPINBTN
#include "wx/spinbutt.h" #include "wx/spinbutt.h"
#endif #endif
#if wxUSE_CHECKLISTBOX
#include "wx/checklst.h"
#endif
#if wxUSE_TOGGLEBTN #if wxUSE_TOGGLEBTN
#include "wx/tglbtn.h" #include "wx/tglbtn.h"
#endif #endif

View File

@@ -21,10 +21,10 @@
#include "wx/log.h" #include "wx/log.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/checklst.h"
#endif #endif
#include "wx/arrstr.h" #include "wx/arrstr.h"
#include "wx/checklst.h"
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
#include "wx/gtk/treeentry_gtk.h" #include "wx/gtk/treeentry_gtk.h"
@@ -880,8 +880,8 @@ int wxListBox::FindString( const wxString &item, bool bCase ) const
int wxListBox::GetSelection() const int wxListBox::GetSelection() const
{ {
wxCHECK_MSG( m_treeview != NULL, -1, wxT("invalid listbox")); wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox"));
wxCHECK_MSG( HasFlag(wxLB_SINGLE), -1, wxCHECK_MSG( HasFlag(wxLB_SINGLE), wxNOT_FOUND,
wxT("must be single selection listbox")); wxT("must be single selection listbox"));
GtkTreeIter iter; GtkTreeIter iter;
@@ -889,7 +889,7 @@ int wxListBox::GetSelection() const
// only works on single-sel // only works on single-sel
if (!gtk_tree_selection_get_selected(selection, NULL, &iter)) if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
return -1; return wxNOT_FOUND;
GtkTreePath* path = GtkTreePath* path =
gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter); gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter);
@@ -903,7 +903,7 @@ int wxListBox::GetSelection() const
int wxListBox::GetSelections( wxArrayInt& aSelections ) const int wxListBox::GetSelections( wxArrayInt& aSelections ) const
{ {
wxCHECK_MSG( m_treeview != NULL, -1, wxT("invalid listbox") ); wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") );
aSelections.Empty(); aSelections.Empty();

View File

@@ -19,10 +19,10 @@
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/checklst.h"
#endif #endif
#include "wx/arrstr.h" #include "wx/arrstr.h"
#include "wx/checklst.h"
#include "wx/gtk1/private.h" #include "wx/gtk1/private.h"
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
@@ -976,7 +976,7 @@ int wxListBox::FindString( const wxString &item, bool bCase ) const
int wxListBox::GetSelection() const int wxListBox::GetSelection() const
{ {
wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); wxCHECK_MSG( m_list != NULL, wxNOT_FOUND, wxT("invalid listbox") );
GList *child = m_list->children; GList *child = m_list->children;
int count = 0; int count = 0;
@@ -986,12 +986,12 @@ int wxListBox::GetSelection() const
count++; count++;
child = child->next; child = child->next;
} }
return -1; return wxNOT_FOUND;
} }
int wxListBox::GetSelections( wxArrayInt& aSelections ) const int wxListBox::GetSelections( wxArrayInt& aSelections ) const
{ {
wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); wxCHECK_MSG( m_list != NULL, wxNOT_FOUND, wxT("invalid listbox") );
// get the number of selected items first // get the number of selected items first
GList *child = m_list->children; GList *child = m_list->children;

View File

@@ -26,6 +26,8 @@
#if wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN #if wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN
#include "wx/checklst.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/object.h" #include "wx/object.h"
#include "wx/colour.h" #include "wx/colour.h"
@@ -41,7 +43,6 @@
#endif #endif
#include "wx/ownerdrw.h" #include "wx/ownerdrw.h"
#include "wx/checklst.h"
#include "wx/msw/wrapwin.h" #include "wx/msw/wrapwin.h"
#include <windowsx.h> #include <windowsx.h>

View File

@@ -26,11 +26,11 @@
#if wxUSE_CHECKLISTBOX #if wxUSE_CHECKLISTBOX
#include "wx/checklst.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#endif #endif
#include "wx/checklst.h"
// include <commctrl.h> "properly" // include <commctrl.h> "properly"
#include "wx/msw/wrapcctl.h" #include "wx/msw/wrapcctl.h"

View File

@@ -24,7 +24,9 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_OWNER_DRAWN #if wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN
#include "wx/checklst.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/object.h" #include "wx/object.h"
@@ -41,7 +43,6 @@
#endif #endif
#include "wx/ownerdrw.h" #include "wx/ownerdrw.h"
#include "wx/checklst.h"
#include "wx/palmos/wrapwin.h" #include "wx/palmos/wrapwin.h"
@@ -283,4 +284,4 @@ int wxCheckListBox::DoHitTestItem(wxCoord x, wxCoord y) const
return wxNOT_FOUND; return wxNOT_FOUND;
} }
#endif #endif // wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN

View File

@@ -25,11 +25,11 @@
#if wxUSE_CHECKLISTBOX #if wxUSE_CHECKLISTBOX
#include "wx/checklst.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/log.h" #include "wx/log.h"
#include "wx/dcclient.h" #include "wx/dcclient.h"
#include "wx/checklst.h"
#include "wx/validate.h" #include "wx/validate.h"
#endif #endif

View File

@@ -22,9 +22,8 @@
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"
#endif
#include "wx/checklst.h" #include "wx/checklst.h"
#endif
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler) IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler)