wxWindow::FindFocus() doesn't exist in wxGTK - #ifdef'd out

[wxWidgets.git] / src / msw / listbox.cpp

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index e199362d2ae1f79491cbea99737e6aa0b4630f68..0ffc6ec3c85bafb28013c3b1be100a2a11e63d72 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -81,7 +81,7 @@ wxOwnerDrawn *wxListBox::CreateItem(uint n)
 // this macro is dangerous but still better than tons of (HWND)GetHWND()
 #define   hwnd    (HWND)GetHWND()
 
 // this macro is dangerous but still better than tons of (HWND)GetHWND()
 #define   hwnd    (HWND)GetHWND()
 

-bool wxListBox::MSWCommand(const WXUINT param, const WXWORD WXUNUSED(id))
+bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))

 {
 /*
   if (param == LBN_SELCANCEL)
 {
 /*
   if (param == LBN_SELCANCEL)


@@ -118,7 +118,9 @@ bool wxListBox::MSWCommand(const WXUINT param, const WXWORD WXUNUSED(id))
   {
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId);
     event.SetEventObject( this );
   {
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId);
     event.SetEventObject( this );

-    if ( !GetEventHandler()->ProcessEvent(event) )
+    GetEventHandler()->ProcessEvent(event) ;
+    return TRUE;
+/*

     {
 #if WXWIN_COMPATIBILITY
       wxWindow *parent = (wxWindow *)GetParent();
     {
 #if WXWIN_COMPATIBILITY
       wxWindow *parent = (wxWindow *)GetParent();


@@ -127,6 +129,7 @@ bool wxListBox::MSWCommand(const WXUINT param, const WXWORD WXUNUSED(id))
 #endif
       return TRUE;
     }
 #endif
       return TRUE;
     }

+ */

   }
   return FALSE;
 }
   }
   return FALSE;
 }


@@ -138,11 +141,11 @@ wxListBox::wxListBox(void)
   m_selected = 0;
 }
 
   m_selected = 0;
 }
 

-bool wxListBox::Create(wxWindow *parent, const wxWindowID id,
+bool wxListBox::Create(wxWindow *parent, wxWindowID id,

                        const wxPoint& pos,
                        const wxSize& size,
                        const wxPoint& pos,
                        const wxSize& size,

-                       const int n, const wxString choices[],
-                       const long style,
+                       int n, const wxString choices[],
+                       long style,

                        const wxValidator& validator,
                        const wxString& name)
 {
                        const wxValidator& validator,
                        const wxString& name)
 {


@@ -258,8 +261,6 @@ wxListBox::~wxListBox(void)
       delete m_aItems[uiCount];
     }
 #endif
       delete m_aItems[uiCount];
     }
 #endif

-
-  DELETEA(m_selections);

 }
 
 void wxListBox::SetupColours(void)
 }
 
 void wxListBox::SetupColours(void)


@@ -268,7 +269,7 @@ void wxListBox::SetupColours(void)
   SetForegroundColour(GetParent()->GetDefaultForegroundColour());
 }
 
   SetForegroundColour(GetParent()->GetDefaultForegroundColour());
 }
 

-void wxListBox::SetFirstItem(const int N)
+void wxListBox::SetFirstItem(int N)

 {
   SendMessage(hwnd,LB_SETTOPINDEX,(WPARAM)N,(LPARAM)0) ;
 }
 {
   SendMessage(hwnd,LB_SETTOPINDEX,(WPARAM)N,(LPARAM)0) ;
 }


@@ -281,7 +282,7 @@ void wxListBox::SetFirstItem(const wxString& s)
     SetFirstItem(N) ;
 }
 
     SetFirstItem(N) ;
 }
 

-void wxListBox::Delete(const int N)
+void wxListBox::Delete(int N)

 {
   SendMessage(hwnd, LB_DELETESTRING, N, 0);
   m_noItems --;
 {
   SendMessage(hwnd, LB_DELETESTRING, N, 0);
   m_noItems --;


@@ -323,7 +324,7 @@ void wxListBox::Append(const wxString& item, char *Client_data)
   SetHorizontalExtent(item);
 }
 
   SetHorizontalExtent(item);
 }
 

-void wxListBox::Set(const int n, const wxString *choices, char** clientData)
+void wxListBox::Set(int n, const wxString *choices, char** clientData)

 {
   ShowWindow(hwnd, SW_HIDE);
   ListBox_ResetContent(hwnd);
 {
   ShowWindow(hwnd, SW_HIDE);
   ListBox_ResetContent(hwnd);


@@ -379,7 +380,7 @@ void wxListBox::Clear(void)
   ListBox_GetHorizontalExtent(hwnd);
 }
 
   ListBox_GetHorizontalExtent(hwnd);
 }
 

-void wxListBox::SetSelection(const int N, const bool select)
+void wxListBox::SetSelection(int N, bool select)

 {
   if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
     SendMessage(hwnd, LB_SETSEL, select, N);
 {
   if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
     SendMessage(hwnd, LB_SETSEL, select, N);


@@ -392,23 +393,23 @@ void wxListBox::SetSelection(const int N, const bool select)
   }
 }
 
   }
 }
 

-bool wxListBox::Selected(const int N) const
+bool wxListBox::Selected(int N) const

 {
   return SendMessage(hwnd, LB_GETSEL, N, 0) == 0 ? FALSE : TRUE;
 }
 
 {
   return SendMessage(hwnd, LB_GETSEL, N, 0) == 0 ? FALSE : TRUE;
 }
 

-void wxListBox::Deselect(const int N)
+void wxListBox::Deselect(int N)

 {
   if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
     SendMessage(hwnd, LB_SETSEL, FALSE, N);
 }
 
 {
   if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
     SendMessage(hwnd, LB_SETSEL, FALSE, N);
 }
 

-char *wxListBox::GetClientData(const int N) const
+char *wxListBox::GetClientData(int N) const

 {
   return (char *)SendMessage(hwnd, LB_GETITEMDATA, N, 0);
 }
 
 {
   return (char *)SendMessage(hwnd, LB_GETITEMDATA, N, 0);
 }
 

-void wxListBox::SetClientData(const int N, char *Client_data)
+void wxListBox::SetClientData(int N, char *Client_data)

 {
   if ( ListBox_SetItemData(hwnd, N, Client_data) == LB_ERR )
     wxLogDebug("LB_SETITEMDATA failed");
 {
   if ( ListBox_SetItemData(hwnd, N, Client_data) == LB_ERR )
     wxLogDebug("LB_SETITEMDATA failed");


@@ -458,7 +459,7 @@ int wxListBox::GetSelection() const
 }
 
 // Find string for position
 }
 
 // Find string for position

-wxString wxListBox::GetString(const int N) const
+wxString wxListBox::GetString(int N) const

 {
   if (N < 0 || N > m_noItems)
     return wxString("");
 {
   if (N < 0 || N > m_noItems)
     return wxString("");


@@ -468,7 +469,7 @@ wxString wxListBox::GetString(const int N) const
   return wxString(wxBuffer);
 }
 
   return wxString(wxBuffer);
 }
 

-void wxListBox::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxListBox::SetSize(int x, int y, int width, int height, int sizeFlags)

 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);


@@ -519,16 +520,6 @@ void wxListBox::SetSize(const int x, const int y, const int width, const int hei
   MoveWindow(hwnd, (int)control_x, (int)control_y,
                    (int)control_width, (int)control_height, TRUE);
 
   MoveWindow(hwnd, (int)control_x, (int)control_y,
                    (int)control_width, (int)control_height, TRUE);
 

-/*
-#if WXWIN_COMPATIBILITY
-  GetEventHandler()->OldOnSize(width, height);
-#else
-  wxSizeEvent event(wxSize(width, height), m_windowId);
-  event.eventObject = this;
-  GetEventHandler()->ProcessEvent(event);
-#endif
-*/
-

 }
 
 // Windows-specific code to set the horizontal extent of
 }
 
 // Windows-specific code to set the horizontal extent of


@@ -592,7 +583,7 @@ void wxListBox::SetHorizontalExtent(const wxString& s)
 }
 
 void
 }
 
 void

-wxListBox::InsertItems(const int nItems, const wxString items[], const int pos)
+wxListBox::InsertItems(int nItems, const wxString items[], int pos)

 {
   int i;
   for (i = 0; i < nItems; i++)
 {
   int i;
   for (i = 0; i < nItems; i++)


@@ -613,7 +604,7 @@ wxListBox::InsertItems(const int nItems, const wxString items[], const int pos)
   SetHorizontalExtent("");
 }
 
   SetHorizontalExtent("");
 }
 

-void wxListBox::SetString(const int N, const wxString& s)
+void wxListBox::SetString(int N, const wxString& s)

 {
   int sel = GetSelection();
   
 {
   int sel = GetSelection();
   


@@ -655,7 +646,7 @@ wxString wxListBox::GetStringSelection (void) const
     return wxString("");
 }
 
     return wxString("");
 }
 

-bool wxListBox::SetStringSelection (const wxString& s, const bool flag)
+bool wxListBox::SetStringSelection (const wxString& s, bool flag)

 {
   int sel = FindString (s);
   if (sel > -1)
 {
   int sel = FindString (s);
   if (sel > -1)


@@ -685,7 +676,7 @@ void wxListBox::Command (wxCommandEvent & event)
   ProcessCommand (event);
 }
 
   ProcessCommand (event);
 }
 

-WXHBRUSH wxListBox::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+WXHBRUSH wxListBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,

                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
 #if CTL3D
                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
 #if CTL3D


@@ -714,6 +705,7 @@ WXHBRUSH wxListBox::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT
 
 long wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
 
 long wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {

+#if 0

   switch (nMsg)
   {
         case WM_INITDIALOG:
   switch (nMsg)
   {
         case WM_INITDIALOG:


@@ -734,9 +726,9 @@ long wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
         case WM_LBUTTONUP:
         case WM_LBUTTONDBLCLK:
         case WM_MOUSEMOVE:
         case WM_LBUTTONUP:
         case WM_LBUTTONDBLCLK:
         case WM_MOUSEMOVE:

-        case WM_DESTROY:

         case WM_COMMAND:
         case WM_NOTIFY:
         case WM_COMMAND:
         case WM_NOTIFY:

+        case WM_DESTROY:

         case WM_MENUSELECT:
         case WM_INITMENUPOPUP:
         case WM_DRAWITEM:
         case WM_MENUSELECT:
         case WM_INITMENUPOPUP:
         case WM_DRAWITEM:


@@ -763,6 +755,8 @@ long wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                case WM_NCHITTEST:
             return MSWDefWindowProc(nMsg, wParam, lParam );
     }
                case WM_NCHITTEST:
             return MSWDefWindowProc(nMsg, wParam, lParam );
     }

+#endif
+

   return wxControl::MSWWindowProc(nMsg, wParam, lParam);
 }
 
   return wxControl::MSWWindowProc(nMsg, wParam, lParam);
 }