some fixes after global _T() => T() change

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/motif/clipbrd.h b/include/wx/motif/clipbrd.h
index 212a16fe538fec47e3bccbded9164def39bb0b2e..781a9a0b94240d215e94eff5300bc321fc09d48f 100644 (file)
--- a/include/wx/motif/clipbrd.h
+++ b/include/wx/motif/clipbrd.h
@@ -110,7 +110,7 @@ class WXDLLEXPORT wxClipboardClient : public wxObject
 
  public:
   /* This list should be filled in with strings indicating the formats
-     this client can provide. Almost all clients will provide "TEXT(".
+     this client can provide. Almost all clients will provide "TEXT".
      Format names should be 4 characters long, so things will work
      out on the Macintosh */
   wxStringList formats;
@@ -147,7 +147,7 @@ class WXDLLEXPORT wxClipboard : public wxObject
   /* Set the clipboard string; does not require a client. */
   void SetClipboardString(char *, long time);
 
-  /* Get data from the clipboard in the format "TEXT(". */
+  /* Get data from the clipboard in the format "TEXT". */
   char *GetClipboardString(long time);
 
   /* Get data from the clipboard */

diff --git a/include/wx/motif/dnd.h b/include/wx/motif/dnd.h
index 2cb1947fa57910bb38b3db810fa845a905c54efd..fab08d7476a8e6216ca984afa47e4b90a255bb20 100644 (file)
--- a/include/wx/motif/dnd.h
+++ b/include/wx/motif/dnd.h
@@ -92,7 +92,7 @@ public:
     
   // the string ID identifies the format of clipboard or DnD data. a word
   // processor would e.g. add a wxTextDataObject and a wxPrivateDataObject
-  // to the clipboard - the latter with the Id "WXWORD_FORMAT(".
+  // to the clipboard - the latter with the Id "WXWORD_FORMAT".
     
   void SetId( const wxString& id )
       { m_id = id; }

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 57e60070891d0c188906929c637e6a1cbab3ca2e..d6d80a783220229a5c9366943e88bf40051d615c 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -254,7 +254,7 @@ static wxString wxGetPrintDlgError()
         case  PDERR_INITFAILURE: msg = T("PDERR_INITFAILURE"); break;
         case  PDERR_GETDEVMODEFAIL: msg = T("PDERR_GETDEVMODEFAIL"); break;
         case  PDERR_DNDMMISMATCH: msg = T("PDERR_DNDMMISMATCH"); break;
-        case  PDERR_DEFAULTDIFFERENT: msg = T("PDERR_DEFAULTDIFFERENT("); break;
+        case  PDERR_DEFAULTDIFFERENT: msg = T("PDERR_DEFAULTDIFFERENT"); break;
         case  PDERR_CREATEICFAILURE: msg = T("PDERR_CREATEICFAILURE"); break;
         default: break;
     }

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index e50a844a60a592bc4f4ed09ff750c421787d5fda..c876d04f7423e82ed308a2d8e723725273da8ca0 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -70,43 +70,43 @@ bool wxFontBase::operator!=(const wxFont& font) const
 
 wxString wxFontBase::GetFamilyString() const
 {
-    wxCHECK_MSG( Ok(), T("wxDEFAULT("), T("invalid font") );
+    wxCHECK_MSG( Ok(), T("wxDEFAULT"), T("invalid font") );
 
     switch ( GetFamily() )
     {
         case wxDECORATIVE:   return T("wxDECORATIVE");
         case wxROMAN:        return T("wxROMAN");
-        case wxSCRIPT:       return T("wxSCRIPT(");
+        case wxSCRIPT:       return T("wxSCRIPT");
         case wxSWISS:        return T("wxSWISS");
         case wxMODERN:       return T("wxMODERN");
         case wxTELETYPE:     return T("wxTELETYPE");
-        default:             return T("wxDEFAULT(");
+        default:             return T("wxDEFAULT");
     }
 }
 
 wxString wxFontBase::GetStyleString() const
 {
-    wxCHECK_MSG( Ok(), T("wxDEFAULT("), T("invalid font") );
+    wxCHECK_MSG( Ok(), T("wxDEFAULT"), T("invalid font") );
 
     switch ( GetStyle() )
     {
         case wxNORMAL:   return T("wxNORMAL");
-        case wxSLANT:    return T("wxSLANT(");
+        case wxSLANT:    return T("wxSLANT");
         case wxITALIC:   return T("wxITALIC");
-        default:         return T("wxDEFAULT(");
+        default:         return T("wxDEFAULT");
     }
 }
 
 wxString wxFontBase::GetWeightString() const
 {
-    wxCHECK_MSG( Ok(), T("wxDEFAULT("), T("invalid font") );
+    wxCHECK_MSG( Ok(), T("wxDEFAULT"), T("invalid font") );
 
     switch ( GetWeight() )
     {
         case wxNORMAL:   return T("wxNORMAL");
         case wxBOLD:     return T("wxBOLD");
-        case wxLIGHT:    return T("wxLIGHT(");
-        default:         return T("wxDEFAULT(");
+        case wxLIGHT:    return T("wxLIGHT");
+        default:         return T("wxDEFAULT");
     }
 }
 

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 3953563b10dc0435b6cc3683fa3951e7b07a0a0e..17a33280d5e84de7a176e21c527f5683a51d01f1 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -74,7 +74,7 @@ wxFTP::wxFTP()
 
 wxFTP::~wxFTP()
 {
-  SendCommand("QUIT(", '2');
+  SendCommand("QUIT", '2');
 }
 
 ////////////////////////////////////////////////////////////////
@@ -132,7 +132,7 @@ bool wxFTP::Close()
     return FALSE;
   }
   if (m_connected)
-    SendCommand(wxString(T("QUIT(")), '2');
+    SendCommand(wxString(T("QUIT")), '2');
   return wxSocketClient::Close();
 }
 
@@ -377,7 +377,7 @@ wxList *wxFTP::GetList(const wxString& wildcard)
 {
   wxList *file_list = new wxList;
   wxSocketBase *sock = GetPort();
-  wxString tmp_str = T("NLST(");
+  wxString tmp_str = T("NLST");
 
   if (!wildcard.IsNull())
     tmp_str += wildcard;

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 539ab01decaabbd6930bb0ec717cf5e881a0db9c..dae75bf4ef5e6a54cb15f9e263f9fcdc47646158 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -147,7 +147,7 @@ void wxColourDatabase::Initialize ()
    {T("AQUAMARINE"),112, 219, 147},
    {T("BLACK"),0, 0, 0},
    {T("BLUE"), 0, 0, 255},
-   {T("BLUE VIOLET("), 159, 95, 159},
+   {T("BLUE VIOLET"), 159, 95, 159},
    {T("BROWN"), 165, 42, 42},
    {T("CADET BLUE"), 95, 159, 159},
    {T("CORAL"), 255, 127, 0},
@@ -209,9 +209,9 @@ void wxColourDatabase::Initialize ()
    {T("TAN"), 219, 147, 112},
    {T("THISTLE"), 216, 191, 216},
    {T("TURQUOISE"), 173, 234, 234},
-   {T("VIOLET("), 79, 47, 79},
+   {T("VIOLET"), 79, 47, 79},
    {T("VIOLET RED"), 204, 50, 153},
-   {T("WHEAT("), 216, 216, 191},
+   {T("WHEAT"), 216, 216, 191},
    {T("WHITE"), 255, 255, 255},
    {T("YELLOW"), 255, 255, 0},
    {T("YELLOW GREEN"), 153, 204, 50},

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 869d99b1f3d8e2f41c0d4a2d45f310e6201a0193..6d0dbc2c2f20d8763877a02ef9261dba73629e1d 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -201,7 +201,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 
   switch (req) {
   case wxHTTP_GET:
-    tmp_buf = T("GET(");
+    tmp_buf = T("GET");
     break;
   default:
     return FALSE;

diff --git a/src/common/resourc2.cpp b/src/common/resourc2.cpp
index cab337e43786977f729b0ccc196c4fa14eb64fb6..42deac36a0895214f6018e0287678195ce49ac4a 100644 (file)
--- a/src/common/resourc2.cpp
+++ b/src/common/resourc2.cpp
@@ -422,7 +422,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { "wxLB_EXTENDED", wxLB_EXTENDED },
   { "wxLB_NEEDED_SB", wxLB_NEEDED_SB },
   { "wxLB_ALWAYS_SB", wxLB_ALWAYS_SB },
-  { "wxLB_SORT(", wxLB_SORT },
+  { "wxLB_SORT", wxLB_SORT },
   { "wxLB_OWNERDRAW", wxLB_OWNERDRAW },
   { "wxLB_HSCROLL", wxLB_HSCROLL },
 
@@ -430,7 +430,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { "wxCB_SIMPLE", wxCB_SIMPLE },
   { "wxCB_DROPDOWN", wxCB_DROPDOWN },
   { "wxCB_READONLY", wxCB_READONLY },
-  { "wxCB_SORT(", wxCB_SORT },
+  { "wxCB_SORT", wxCB_SORT },
 
   /* wxGauge */
   { "wxGA_PROGRESSBAR", wxGA_PROGRESSBAR },
@@ -457,9 +457,9 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { "wxSL_VERTICAL", wxSL_VERTICAL },
   { "wxSL_AUTOTICKS", wxSL_AUTOTICKS },
   { "wxSL_LABELS", wxSL_LABELS },
-  { "wxSL_LEFT(", wxSL_LEFT },
+  { "wxSL_LEFT", wxSL_LEFT },
   { "wxSL_TOP", wxSL_TOP },
-  { "wxSL_RIGHT(", wxSL_RIGHT },
+  { "wxSL_RIGHT", wxSL_RIGHT },
   { "wxSL_BOTTOM", wxSL_BOTTOM },
   { "wxSL_BOTH", wxSL_BOTH },
   { "wxSL_SELRANGE", wxSL_SELRANGE },
@@ -475,17 +475,17 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   /* wxTreeCtrl */
   { "wxTR_HAS_BUTTONS", wxTR_HAS_BUTTONS },
   { "wxTR_EDIT_LABELS", wxTR_EDIT_LABELS },
-  { "wxTR_LINES_AT_ROOT(", wxTR_LINES_AT_ROOT },
+  { "wxTR_LINES_AT_ROOT", wxTR_LINES_AT_ROOT },
 
   /* wxListCtrl */
   { "wxLC_ICON", wxLC_ICON },
   { "wxLC_SMALL_ICON", wxLC_SMALL_ICON },
-  { "wxLC_LIST(", wxLC_LIST },
-  { "wxLC_REPORT(", wxLC_REPORT },
+  { "wxLC_LIST", wxLC_LIST },
+  { "wxLC_REPORT", wxLC_REPORT },
   { "wxLC_ALIGN_TOP", wxLC_ALIGN_TOP },
-  { "wxLC_ALIGN_LEFT(", wxLC_ALIGN_LEFT },
+  { "wxLC_ALIGN_LEFT", wxLC_ALIGN_LEFT },
   { "wxLC_AUTOARRANGE", wxLC_AUTOARRANGE },
-  { "wxLC_USER_TEXT(", wxLC_USER_TEXT },
+  { "wxLC_USER_TEXT", wxLC_USER_TEXT },
   { "wxLC_EDIT_LABELS", wxLC_EDIT_LABELS },
   { "wxLC_NO_HEADER", wxLC_NO_HEADER },
   { "wxLC_NO_SORT_HEADER", wxLC_NO_SORT_HEADER },
@@ -515,17 +515,17 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
 
   /* wxControl */
   { "wxFIXED_LENGTH", wxFIXED_LENGTH},
-  { "wxALIGN_LEFT(", wxALIGN_LEFT},
+  { "wxALIGN_LEFT", wxALIGN_LEFT},
   { "wxALIGN_CENTER", wxALIGN_CENTER},
   { "wxALIGN_CENTRE", wxALIGN_CENTRE},
-  { "wxALIGN_RIGHT(", wxALIGN_RIGHT},
+  { "wxALIGN_RIGHT", wxALIGN_RIGHT},
   { "wxCOLOURED", wxCOLOURED},
 
   /* wxToolBar */
   { "wxTB_3DBUTTONS", wxTB_3DBUTTONS},
   { "wxTB_HORIZONTAL", wxTB_HORIZONTAL},
   { "wxTB_VERTICAL", wxTB_VERTICAL},
-  { "wxTB_FLAT(", wxTB_FLAT},
+  { "wxTB_FLAT", wxTB_FLAT},
 
   /* Generic */
   { "wxVSCROLL", wxVSCROLL },
@@ -536,7 +536,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { "wxMINIMIZE", wxICONIZE},
   { "wxMAXIMIZE", wxMAXIMIZE},
   { "wxSDI", 0},
-  { "wxMDI_PARENT(", 0},
+  { "wxMDI_PARENT", 0},
   { "wxMDI_CHILD", 0},
   { "wxTHICK_FRAME", wxTHICK_FRAME},
   { "wxRESIZE_BORDER", wxRESIZE_BORDER},
@@ -552,7 +552,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { "wxNATIVE_IMPL", 0},
   { "wxEXTENDED_IMPL", 0},
   { "wxBACKINGSTORE", wxBACKINGSTORE},
-//  { "wxFLAT(", wxFLAT},
+//  { "wxFLAT", wxFLAT},
 //  { "wxMOTIF_RESIZE", wxMOTIF_RESIZE},
   { "wxFIXED_LENGTH", 0},
   { "wxDOUBLE_BORDER", wxDOUBLE_BORDER},
@@ -565,30 +565,30 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { "wxCLIP_CHILDREN", wxCLIP_CHILDREN},
 
   { "wxTINY_CAPTION_HORIZ", wxTINY_CAPTION_HORIZ},
-  { "wxTINY_CAPTION_VERT(", wxTINY_CAPTION_VERT},
+  { "wxTINY_CAPTION_VERT", wxTINY_CAPTION_VERT},
 
   // Text font families
-  { "wxDEFAULT(", wxDEFAULT},
+  { "wxDEFAULT", wxDEFAULT},
   { "wxDECORATIVE", wxDECORATIVE},
   { "wxROMAN", wxROMAN},
-  { "wxSCRIPT(", wxSCRIPT},
+  { "wxSCRIPT", wxSCRIPT},
   { "wxSWISS", wxSWISS},
   { "wxMODERN", wxMODERN},
   { "wxTELETYPE", wxTELETYPE},
   { "wxVARIABLE", wxVARIABLE},
   { "wxFIXED", wxFIXED},
   { "wxNORMAL", wxNORMAL},
-  { "wxLIGHT(", wxLIGHT},
+  { "wxLIGHT", wxLIGHT},
   { "wxBOLD", wxBOLD},
   { "wxITALIC", wxITALIC},
-  { "wxSLANT(", wxSLANT},
+  { "wxSLANT", wxSLANT},
   { "wxSOLID", wxSOLID},
-  { "wxDOT(", wxDOT},
+  { "wxDOT", wxDOT},
   { "wxLONG_DASH", wxLONG_DASH},
   { "wxSHORT_DASH", wxSHORT_DASH},
   { "wxDOT_DASH", wxDOT_DASH},
   { "wxUSER_DASH", wxUSER_DASH},
-  { "wxTRANSPARENT(", wxTRANSPARENT},
+  { "wxTRANSPARENT", wxTRANSPARENT},
   { "wxSTIPPLE", wxSTIPPLE},
   { "wxBDIAGONAL_HATCH", wxBDIAGONAL_HATCH},
   { "wxCROSSDIAG_HATCH", wxCROSSDIAG_HATCH},
@@ -601,25 +601,25 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { "wxJOIN_ROUND", wxJOIN_ROUND},
   { "wxCAP_ROUND", wxCAP_ROUND},
   { "wxCAP_PROJECTING", wxCAP_PROJECTING},
-  { "wxCAP_BUTT(", wxCAP_BUTT},
+  { "wxCAP_BUTT", wxCAP_BUTT},
 
   // Logical ops
   { "wxCLEAR", wxCLEAR},
   { "wxXOR", wxXOR},
-  { "wxINVERT(", wxINVERT},
+  { "wxINVERT", wxINVERT},
   { "wxOR_REVERSE", wxOR_REVERSE},
   { "wxAND_REVERSE", wxAND_REVERSE},
   { "wxCOPY", wxCOPY},
   { "wxAND", wxAND},
-  { "wxAND_INVERT(", wxAND_INVERT},
+  { "wxAND_INVERT", wxAND_INVERT},
   { "wxNO_OP", wxNO_OP},
   { "wxNOR", wxNOR},
   { "wxEQUIV", wxEQUIV},
-  { "wxSRC_INVERT(", wxSRC_INVERT},
-  { "wxOR_INVERT(", wxOR_INVERT},
+  { "wxSRC_INVERT", wxSRC_INVERT},
+  { "wxOR_INVERT", wxOR_INVERT},
   { "wxNAND", wxNAND},
   { "wxOR", wxOR},
-  { "wxSET(", wxSET},
+  { "wxSET", wxSET},
 
   { "wxFLOOD_SURFACE", wxFLOOD_SURFACE},
   { "wxFLOOD_BORDER", wxFLOOD_BORDER},

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index 4c53d60295386aaba4365b7a0fdcd522eee61837..c7f54d8fa0877bb9853f047eccbd5064d838a947 100644 (file)
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -1791,7 +1791,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { T("wxLB_EXTENDED"), wxLB_EXTENDED },
   { T("wxLB_NEEDED_SB"), wxLB_NEEDED_SB },
   { T("wxLB_ALWAYS_SB"), wxLB_ALWAYS_SB },
-  { T("wxLB_SORT("), wxLB_SORT },
+  { T("wxLB_SORT"), wxLB_SORT },
   { T("wxLB_OWNERDRAW"), wxLB_OWNERDRAW },
   { T("wxLB_HSCROLL"), wxLB_HSCROLL },
 
@@ -1799,7 +1799,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { T("wxCB_SIMPLE"), wxCB_SIMPLE },
   { T("wxCB_DROPDOWN"), wxCB_DROPDOWN },
   { T("wxCB_READONLY"), wxCB_READONLY },
-  { T("wxCB_SORT("), wxCB_SORT },
+  { T("wxCB_SORT"), wxCB_SORT },
 
   /* wxGauge */
   { T("wxGA_PROGRESSBAR"), wxGA_PROGRESSBAR },
@@ -1827,9 +1827,9 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { T("wxSL_VERTICAL"), wxSL_VERTICAL },
   { T("wxSL_AUTOTICKS"), wxSL_AUTOTICKS },
   { T("wxSL_LABELS"), wxSL_LABELS },
-  { T("wxSL_LEFT("), wxSL_LEFT },
+  { T("wxSL_LEFT"), wxSL_LEFT },
   { T("wxSL_TOP"), wxSL_TOP },
-  { T("wxSL_RIGHT("), wxSL_RIGHT },
+  { T("wxSL_RIGHT"), wxSL_RIGHT },
   { T("wxSL_BOTTOM"), wxSL_BOTTOM },
   { T("wxSL_BOTH"), wxSL_BOTH },
   { T("wxSL_SELRANGE"), wxSL_SELRANGE },
@@ -1845,17 +1845,17 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   /* wxTreeCtrl */
   { T("wxTR_HAS_BUTTONS"), wxTR_HAS_BUTTONS },
   { T("wxTR_EDIT_LABELS"), wxTR_EDIT_LABELS },
-  { T("wxTR_LINES_AT_ROOT("), wxTR_LINES_AT_ROOT },
+  { T("wxTR_LINES_AT_ROOT"), wxTR_LINES_AT_ROOT },
 
   /* wxListCtrl */
   { T("wxLC_ICON"), wxLC_ICON },
   { T("wxLC_SMALL_ICON"), wxLC_SMALL_ICON },
-  { T("wxLC_LIST("), wxLC_LIST },
-  { T("wxLC_REPORT("), wxLC_REPORT },
+  { T("wxLC_LIST"), wxLC_LIST },
+  { T("wxLC_REPORT"), wxLC_REPORT },
   { T("wxLC_ALIGN_TOP"), wxLC_ALIGN_TOP },
-  { T("wxLC_ALIGN_LEFT("), wxLC_ALIGN_LEFT },
+  { T("wxLC_ALIGN_LEFT"), wxLC_ALIGN_LEFT },
   { T("wxLC_AUTOARRANGE"), wxLC_AUTOARRANGE },
-  { T("wxLC_USER_TEXT("), wxLC_USER_TEXT },
+  { T("wxLC_USER_TEXT"), wxLC_USER_TEXT },
   { T("wxLC_EDIT_LABELS"), wxLC_EDIT_LABELS },
   { T("wxLC_NO_HEADER"), wxLC_NO_HEADER },
   { T("wxLC_NO_SORT_HEADER"), wxLC_NO_SORT_HEADER },
@@ -1885,17 +1885,17 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
 
   /* wxControl */
   { T("wxFIXED_LENGTH"), wxFIXED_LENGTH},
-  { T("wxALIGN_LEFT("), wxALIGN_LEFT},
+  { T("wxALIGN_LEFT"), wxALIGN_LEFT},
   { T("wxALIGN_CENTER"), wxALIGN_CENTER},
   { T("wxALIGN_CENTRE"), wxALIGN_CENTRE},
-  { T("wxALIGN_RIGHT("), wxALIGN_RIGHT},
+  { T("wxALIGN_RIGHT"), wxALIGN_RIGHT},
   { T("wxCOLOURED"), wxCOLOURED},
 
   /* wxToolBar */
   { T("wxTB_3DBUTTONS"), wxTB_3DBUTTONS},
   { T("wxTB_HORIZONTAL"), wxTB_HORIZONTAL},
   { T("wxTB_VERTICAL"), wxTB_VERTICAL},
-  { T("wxTB_FLAT("), wxTB_FLAT},
+  { T("wxTB_FLAT"), wxTB_FLAT},
 
   /* wxDialog */
   { T("wxDIALOG_MODAL"), wxDIALOG_MODAL },
@@ -1909,7 +1909,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { T("wxMINIMIZE"), wxICONIZE},
   { T("wxMAXIMIZE"), wxMAXIMIZE},
   { T("wxSDI"), 0},
-  { T("wxMDI_PARENT("), 0},
+  { T("wxMDI_PARENT"), 0},
   { T("wxMDI_CHILD"), 0},
   { T("wxTHICK_FRAME"), wxTHICK_FRAME},
   { T("wxRESIZE_BORDER"), wxRESIZE_BORDER},
@@ -1925,7 +1925,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { T("wxNATIVE_IMPL"), 0},
   { T("wxEXTENDED_IMPL"), 0},
   { T("wxBACKINGSTORE"), wxBACKINGSTORE},
-//  { T("wxFLAT("), wxFLAT},
+//  { T("wxFLAT"), wxFLAT},
 //  { T("wxMOTIF_RESIZE"), wxMOTIF_RESIZE},
   { T("wxFIXED_LENGTH"), 0},
   { T("wxDOUBLE_BORDER"), wxDOUBLE_BORDER},
@@ -1939,30 +1939,30 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { T("wxTAB_TRAVERSAL"), 0}, // Compatibility only
 
   { T("wxTINY_CAPTION_HORIZ"), wxTINY_CAPTION_HORIZ},
-  { T("wxTINY_CAPTION_VERT("), wxTINY_CAPTION_VERT},
+  { T("wxTINY_CAPTION_VERT"), wxTINY_CAPTION_VERT},
 
   // Text font families
-  { T("wxDEFAULT("), wxDEFAULT},
+  { T("wxDEFAULT"), wxDEFAULT},
   { T("wxDECORATIVE"), wxDECORATIVE},
   { T("wxROMAN"), wxROMAN},
-  { T("wxSCRIPT("), wxSCRIPT},
+  { T("wxSCRIPT"), wxSCRIPT},
   { T("wxSWISS"), wxSWISS},
   { T("wxMODERN"), wxMODERN},
   { T("wxTELETYPE"), wxTELETYPE},
   { T("wxVARIABLE"), wxVARIABLE},
   { T("wxFIXED"), wxFIXED},
   { T("wxNORMAL"), wxNORMAL},
-  { T("wxLIGHT("), wxLIGHT},
+  { T("wxLIGHT"), wxLIGHT},
   { T("wxBOLD"), wxBOLD},
   { T("wxITALIC"), wxITALIC},
-  { T("wxSLANT("), wxSLANT},
+  { T("wxSLANT"), wxSLANT},
   { T("wxSOLID"), wxSOLID},
-  { T("wxDOT("), wxDOT},
+  { T("wxDOT"), wxDOT},
   { T("wxLONG_DASH"), wxLONG_DASH},
   { T("wxSHORT_DASH"), wxSHORT_DASH},
   { T("wxDOT_DASH"), wxDOT_DASH},
   { T("wxUSER_DASH"), wxUSER_DASH},
-  { T("wxTRANSPARENT("), wxTRANSPARENT},
+  { T("wxTRANSPARENT"), wxTRANSPARENT},
   { T("wxSTIPPLE"), wxSTIPPLE},
   { T("wxBDIAGONAL_HATCH"), wxBDIAGONAL_HATCH},
   { T("wxCROSSDIAG_HATCH"), wxCROSSDIAG_HATCH},
@@ -1975,25 +1975,25 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { T("wxJOIN_ROUND"), wxJOIN_ROUND},
   { T("wxCAP_ROUND"), wxCAP_ROUND},
   { T("wxCAP_PROJECTING"), wxCAP_PROJECTING},
-  { T("wxCAP_BUTT("), wxCAP_BUTT},
+  { T("wxCAP_BUTT"), wxCAP_BUTT},
 
   // Logical ops
   { T("wxCLEAR"), wxCLEAR},
   { T("wxXOR"), wxXOR},
-  { T("wxINVERT("), wxINVERT},
+  { T("wxINVERT"), wxINVERT},
   { T("wxOR_REVERSE"), wxOR_REVERSE},
   { T("wxAND_REVERSE"), wxAND_REVERSE},
   { T("wxCOPY"), wxCOPY},
   { T("wxAND"), wxAND},
-  { T("wxAND_INVERT("), wxAND_INVERT},
+  { T("wxAND_INVERT"), wxAND_INVERT},
   { T("wxNO_OP"), wxNO_OP},
   { T("wxNOR"), wxNOR},
   { T("wxEQUIV"), wxEQUIV},
-  { T("wxSRC_INVERT("), wxSRC_INVERT},
-  { T("wxOR_INVERT("), wxOR_INVERT},
+  { T("wxSRC_INVERT"), wxSRC_INVERT},
+  { T("wxOR_INVERT"), wxOR_INVERT},
   { T("wxNAND"), wxNAND},
   { T("wxOR"), wxOR},
-  { T("wxSET("), wxSET},
+  { T("wxSET"), wxSET},
 
   { T("wxFLOOD_SURFACE"), wxFLOOD_SURFACE},
   { T("wxFLOOD_BORDER"), wxFLOOD_BORDER},

diff --git a/src/common/time.cpp b/src/common/time.cpp
index 53d034ccf1147ea097baa4dc091a1c0e6fc05b44..1a20e34b639d08d8950d9ca65ebd23581e2e11b8 100644 (file)
--- a/src/common/time.cpp
+++ b/src/common/time.cpp
@@ -147,7 +147,7 @@ wxTime::wxTime(const wxDate& date, hourTy h, minuteTy m, secondTy s, bool dst)
 /*
                 if (IsDST()) setError(NIHCL_BADTIME,DEFAULT,
                 date.dayOfMonth(),date.nameOfMonth(),date.year(),
-                h,m,s,(dst?_("DST("):""));
+                h,m,s,(dst?_("DST"):""));
 */
   }
   sec += TIME_ZONE;                               // adjust to GMT

diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index 0ec94904f7ebd962d3ee9561c2dc9e374ec25d01..dae8bbb6c29afe6b8688461f1c21914170fa10e2 100644 (file)
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -63,7 +63,7 @@ END_EVENT_TABLE()
 #define NUM_COLS 48
 static wxString wxColourDialogNames[NUM_COLS]={T("ORANGE"),
             T("GOLDENROD"),
-            T("WHEAT("),
+            T("WHEAT"),
             T("SPRING GREEN"),
             T("SKY BLUE"),
             T("SLATE BLUE"),

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index 81762a32238e17406ef8c6a66d5b8bfd3b436821..54225981964424fc4f3c421d773596384851adba 100644 (file)
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -59,7 +59,7 @@ END_EVENT_TABLE()
 #define NUM_COLS 48
 static wxString wxColourDialogNames[NUM_COLS]={T("ORANGE"),
                     T("GOLDENROD"),
-                    T("WHEAT("),
+                    T("WHEAT"),
                     T("SPRING GREEN"),
                     T("SKY BLUE"),
                     T("SLATE BLUE"),

diff --git a/src/gtk/utilsres.cpp b/src/gtk/utilsres.cpp
index f0bf3981a38e437026ec01ba62cc24c8de8533b1..d165c8adf627b48b4eeef248edf68da1d6796f52 100644 (file)
--- a/src/gtk/utilsres.cpp
+++ b/src/gtk/utilsres.cpp
@@ -99,7 +99,7 @@ static wxChar *GetIniFile(wxChar *dest, const wxChar *filename)
         if (dest[wxStrlen(dest) - 1] != T('/')) wxStrcat(dest, T("/"));
         if (filename == NULL)
         {
-          if ((filename = wxGetenv(T("XENVIRONMENT("))) == NULL) filename = T(".Xdefaults");
+          if ((filename = wxGetenv(T("XENVIRONMENT"))) == NULL) filename = T(".Xdefaults");
         }
         else
           if (*filename != T('.')) wxStrcat(dest, T("."));
@@ -148,7 +148,7 @@ static void wxXMergeDatabases()
     // Open XENVIRONMENT file, or if not defined, the .Xdefaults,
     // and merge into existing database
 
-    if ((environment = wxGetenv(T("XENVIRONMENT("))) == NULL) 
+    if ((environment = wxGetenv(T("XENVIRONMENT"))) == NULL) 
     {
         size_t len;
 #if wxUSE_UNICODE
@@ -352,7 +352,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
     {
         // Handle True, False here
         // True, Yes, Enables, Set or  Activated
-        if (*s == 'T(' || *s == 'Y' || *s == 'E' || *s == 'S' || *s == 'A')
+        if (*s == 'T' || *s == 'Y' || *s == 'E' || *s == 'S' || *s == 'A')
             *value = TRUE;
         // False, No, Disabled, Reset, Cleared, Deactivated
         else if (*s == 'F' || *s == 'N' || *s == 'D' || *s == 'R' || *s == 'C')

diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp
index f0bf3981a38e437026ec01ba62cc24c8de8533b1..d165c8adf627b48b4eeef248edf68da1d6796f52 100644 (file)
--- a/src/gtk1/utilsres.cpp
+++ b/src/gtk1/utilsres.cpp
@@ -99,7 +99,7 @@ static wxChar *GetIniFile(wxChar *dest, const wxChar *filename)
         if (dest[wxStrlen(dest) - 1] != T('/')) wxStrcat(dest, T("/"));
         if (filename == NULL)
         {
-          if ((filename = wxGetenv(T("XENVIRONMENT("))) == NULL) filename = T(".Xdefaults");
+          if ((filename = wxGetenv(T("XENVIRONMENT"))) == NULL) filename = T(".Xdefaults");
         }
         else
           if (*filename != T('.')) wxStrcat(dest, T("."));
@@ -148,7 +148,7 @@ static void wxXMergeDatabases()
     // Open XENVIRONMENT file, or if not defined, the .Xdefaults,
     // and merge into existing database
 
-    if ((environment = wxGetenv(T("XENVIRONMENT("))) == NULL) 
+    if ((environment = wxGetenv(T("XENVIRONMENT"))) == NULL) 
     {
         size_t len;
 #if wxUSE_UNICODE
@@ -352,7 +352,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
     {
         // Handle True, False here
         // True, Yes, Enables, Set or  Activated
-        if (*s == 'T(' || *s == 'Y' || *s == 'E' || *s == 'S' || *s == 'A')
+        if (*s == 'T' || *s == 'Y' || *s == 'E' || *s == 'S' || *s == 'A')
             *value = TRUE;
         // False, No, Disabled, Reset, Cleared, Deactivated
         else if (*s == 'F' || *s == 'N' || *s == 'D' || *s == 'R' || *s == 'C')

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 7ce1523592e4d0eafc56330b015b73a359af388b..9379ddd1d9231a873d050c16feeba6ba5049820e 100644 (file)
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -119,7 +119,7 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
         return TRUE;
     }
 
-    else if (tag.GetName() == "OBJECT(") {
+    else if (tag.GetName() == "OBJECT") {
         m_Name = m_Page = wxEmptyString;
         ParseInner(tag);
         if (m_Page != wxEmptyString) {

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index ea07bad616c5099c4398ae6afceb892b7c943b1f..4e5800662102849069dd691572cba9ce40664e07 100644 (file)
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -323,9 +323,9 @@ void wxHtmlContainerCell::SetAlign(const wxHtmlTag& tag)
         alg.MakeUpper();
         if (alg == "CENTER")
             SetAlignHor(HTML_ALIGN_CENTER);
-        else if (alg == "LEFT(")
+        else if (alg == "LEFT")
             SetAlignHor(HTML_ALIGN_LEFT);
-        else if (alg == "RIGHT(")
+        else if (alg == "RIGHT")
             SetAlignHor(HTML_ALIGN_RIGHT);
     }
 }

diff --git a/src/html/m_fonts.cpp b/src/html/m_fonts.cpp
index 1718aa01e791a5b8401d7eb9edf5c96ba845350e..2919a029b4e0f2f4cc7a5dccb26c1d89eb3c6b14 100644 (file)
--- a/src/html/m_fonts.cpp
+++ b/src/html/m_fonts.cpp
@@ -30,7 +30,7 @@
 FORCE_LINK_ME(mod_fonts)
 
 
-TAG_HANDLER_BEGIN(FONT, "FONT(")
+TAG_HANDLER_BEGIN(FONT, "FONT")
 
     TAG_HANDLER_PROC(tag)
     {
@@ -71,7 +71,7 @@ TAG_HANDLER_BEGIN(FONT, "FONT(")
 TAG_HANDLER_END(FONT)
 
 
-TAG_HANDLER_BEGIN(FACES, "U,I,B,TT(")
+TAG_HANDLER_BEGIN(FACES, "U,I,B,TT")
 
     TAG_HANDLER_PROC(tag)
     {

diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index 556bbe4fdfcabdee4775cc3e6c280e51c15e9b61..020c60230ee946c780492671edd7a98ba1073537 100644 (file)
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -382,7 +382,7 @@ TAG_HANDLER_BEGIN(IMG, "IMG, MAP, AREA")
 
                    str = m_WParser -> GetFS() -> OpenFile(tmp);
                    if (tag.HasParam("WIDTH")) tag.ScanParam("WIDTH", "%i", &w);
-                   if (tag.HasParam("HEIGHT(")) tag.ScanParam("HEIGHT(", "%i", &h);
+                   if (tag.HasParam("HEIGHT")) tag.ScanParam("HEIGHT", "%i", &h);
                    al = HTML_ALIGN_BOTTOM;
                    if (tag.HasParam("ALIGN")) {
                        wxString alstr = tag.GetParam("ALIGN");
@@ -441,7 +441,7 @@ TAG_HANDLER_BEGIN(IMG, "IMG, MAP, AREA")
                        {
                                cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::CIRCLE, coords );
                        }
-                       else if (tmp == "RECT(")
+                       else if (tmp == "RECT")
                        {
                                cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::RECT, coords );
                        }

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index c4c93728c9a6f184d6c94ca7809930c5b4da859b..c34aa5486801aae87ce6d5a2f51274c3ced43e0a 100644 (file)
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -165,8 +165,8 @@ TAG_HANDLER_BEGIN(BODY, "BODY")
         unsigned long tmp;
         wxColour clr;
 
-        if (tag.HasParam("TEXT(")) {
-            if (tag.ScanParam("TEXT(", "#%lX", &tmp) == 1) {
+        if (tag.HasParam("TEXT")) {
+            if (tag.ScanParam("TEXT", "#%lX", &tmp) == 1) {
                 clr = wxColour((tmp & 0xFF0000) >> 16 , (tmp & 0x00FF00) >> 8, (tmp & 0x0000FF));
                 m_WParser -> SetActualColor(clr);
                 m_WParser -> GetContainer() -> InsertCell(new wxHtmlColourCell(clr));

diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp
index 76f85d087e0c16f8bd92743a04569ed9d24f7653..a93a089c9a165076153f8a4df5c385d02efe6f92 100644 (file)
--- a/src/html/m_tables.cpp
+++ b/src/html/m_tables.cpp
@@ -469,7 +469,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
                     als = m_rAlign;
                     if (tag.HasParam("ALIGN")) als = tag.GetParam("ALIGN");
                     als.MakeUpper();
-                    if (als == "RIGHT(") m_WParser -> SetAlign(HTML_ALIGN_RIGHT);
+                    if (als == "RIGHT") m_WParser -> SetAlign(HTML_ALIGN_RIGHT);
                     else if (als == "CENTER") m_WParser -> SetAlign(HTML_ALIGN_CENTER);
                 }
                 m_WParser -> OpenContainer();

diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp
index 84dca0b0f0891ab83f08108fe8e6724c933c12de..0cc48a40f01c35107459b5b80eae9eaa13a97d85 100644 (file)
--- a/src/motif/clipbrd.cpp
+++ b/src/motif/clipbrd.cpp
@@ -85,7 +85,7 @@ bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
         window = XtWindow( (Widget) wxTheApp->GetTopWindow()->GetTopWidget() );
 
     int success = XmClipboardRetrieve((Display*) wxGetDisplay(),
-      window, "TEXT(", (XtPointer) 0, 0, & numBytes, & privateId) ;
+      window, "TEXT", (XtPointer) 0, 0, & numBytes, & privateId) ;
 
     // Assume only text is supported. If we have anything at all,
     // or the clipboard is locked so we're not sure, we say we support it.
@@ -128,7 +128,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int width, int h
       XmClipboardCopy((Display*) wxGetDisplay(),
        window, 
        itemId,
-       "TEXT(",
+       "TEXT",
        (XtPointer) data,
        strlen(data) + 1,
        0,
@@ -171,7 +171,7 @@ wxObject *wxGetClipboardData(wxDataFormat dataFormat, long *len)
        }
         result = XmClipboardRetrieve((Display*) wxGetDisplay(),
           window,
-          "TEXT(",
+          "TEXT",
           (XtPointer) data,
           currentDataSize,
           &numBytes,
@@ -224,7 +224,7 @@ bool wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int max
     // Only wxDF_TEXT supported
     if (dataFormat == wxDF_TEXT)
     {
-       strcpy(formatName, "TEXT(");
+       strcpy(formatName, "TEXT");
        return TRUE;
     }
     else
@@ -413,7 +413,7 @@ wxClipboard::~wxClipboard()
 
 static int FormatStringToID(char *str)
 {
-    if (!strcmp(str, "TEXT("))
+    if (!strcmp(str, "TEXT"))
         return wxDF_TEXT;
     
     return wxRegisterClipboardFormat(str);
@@ -499,7 +499,7 @@ char *wxClipboard::GetClipboardString(long time)
     char *str;
     long length;
     
-    str = GetClipboardData("TEXT(", &length, time);
+    str = GetClipboardData("TEXT", &length, time);
     if (!str) {
         str = new char[1];
         *str = 0;
@@ -516,7 +516,7 @@ char *wxClipboard::GetClipboardData(char *format, long *length, long time)
         else
             return NULL;
     } else if (cbString) {
-        if (!strcmp(format, "TEXT("))
+        if (!strcmp(format, "TEXT"))
             return copystring(cbString);
         else
             return NULL;

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 10d2f165b36985d02f5190e6246c9a4ef1e04a52..094a3e869901d2e55565652c89950ef378f57a2d 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -194,7 +194,7 @@ static char * GetIniFile (char *dest, const char *filename)
             strcat (dest, "/");
         if (filename == NULL)
         {
-            if ((filename = getenv ("XENVIRONMENT(")) == NULL)
+            if ((filename = getenv ("XENVIRONMENT")) == NULL)
                 filename = ".Xdefaults";
         }
         else if (*filename != '.')
@@ -405,7 +405,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
     {
         // Handle True, False here
         // True, Yes, Enables, Set or  Activated
-        if (*s == 'T(' || *s == 'Y' || *s == 'E' || *s == 'S' || *s == 'A')
+        if (*s == 'T' || *s == 'Y' || *s == 'E' || *s == 'S' || *s == 'A')
             *value = TRUE;
         // False, No, Disabled, Reset, Cleared, Deactivated
         else if (*s == 'F' || *s == 'N' || *s == 'D' || *s == 'R' || *s == 'C')
@@ -457,7 +457,7 @@ void wxXMergeDatabases (wxApp * theApp, Display * display)
     * and merge into existing database
     */
 
-    if ((environment = getenv ("XENVIRONMENT(")) == NULL)
+    if ((environment = getenv ("XENVIRONMENT")) == NULL)
     {
         size_t len;
         environment = GetIniFile (filename, NULL);

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 25ba3cb474caa3011cf4453d4e2cc7ae166c2ea8..7781b4db12cf0d9ecd1fb27386f9d4873cfc18f9 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -225,12 +225,12 @@ wxCursor::wxCursor(int cursor_type)
     }
     case wxCURSOR_POINT_LEFT:
     {
-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), T("wxCURSOR_PLEFT("));
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), T("wxCURSOR_PLEFT"));
       break;
     }
     case wxCURSOR_POINT_RIGHT:
     {
-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), T("wxCURSOR_PRIGHT("));
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), T("wxCURSOR_PRIGHT"));
       break;
     }
     case wxCURSOR_QUESTION_ARROW:

diff --git a/src/msw/data.cpp b/src/msw/data.cpp
index 30cee8dff05d41a8a021db812623e0da0940a034..0878e4bb34d819b42fe078e7a943eabacb283033 100644 (file)
--- a/src/msw/data.cpp
+++ b/src/msw/data.cpp
@@ -160,7 +160,7 @@ const wxChar *wxFloatToStringStr = T("%.2f");
 const wxChar *wxDoubleToStringStr = T("%.2f");
 
 #ifdef __WXMSW__
-const wxChar *wxUserResourceStr = T("TEXT(");
+const wxChar *wxUserResourceStr = T("TEXT");
 #endif
 
 #if wxUSE_SHARED_LIBRARY

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 3f371aa6d76735d1e8fc16c07d83922c54423991..37eb51058e7febc4d057f028298987250210bc41 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -1099,7 +1099,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
     m_hWnd = (WXHWND)::CreateWindowEx
                        (
                         exStyle,
-                        T("MDICLIENT("),
+                        T("MDICLIENT"),
                         NULL,
                         msStyle,
                         0, 0, 0, 0,

diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp
index 0d9fca1ca289278722cf903faf97fbeb368b0943..6ec8d751c10475eb95f96c0e84784e2a69c0d916 100644 (file)
--- a/src/msw/nativdlg.cpp
+++ b/src/msw/nativdlg.cpp
@@ -227,7 +227,7 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
     // for correct functioning.
     // Could have wxWindow::AdoptAttributesFromHWND(WXHWND)
     // to be overridden by each control class.
-    else if (str == T("EDIT("))
+    else if (str == T("EDIT"))
     {
         win = new wxTextCtrl;
     }

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index d39371cdf4e4400d667bb91b61998420a8ad5f46..61ceeb2c74ace4a9fb787bb63e8f5a61fd65188d 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -407,19 +407,19 @@ const char *wxDataObject::GetFormatName(wxDataFormat format)
 
   static char s_szBuf[128];
   switch ( format ) {
-    case CF_TEXT:         return "CF_TEXT(";
+    case CF_TEXT:         return "CF_TEXT";
     case CF_BITMAP:       return "CF_BITMAP";
-    case CF_METAFILEPICT: return "CF_METAFILEPICT(";
+    case CF_METAFILEPICT: return "CF_METAFILEPICT";
     case CF_SYLK:         return "CF_SYLK";
     case CF_DIF:          return "CF_DIF";
     case CF_TIFF:         return "CF_TIFF";
-    case CF_OEMTEXT:      return "CF_OEMTEXT(";
+    case CF_OEMTEXT:      return "CF_OEMTEXT";
     case CF_DIB:          return "CF_DIB";
     case CF_PALETTE:      return "CF_PALETTE";
     case CF_PENDATA:      return "CF_PENDATA";
     case CF_RIFF:         return "CF_RIFF";
     case CF_WAVE:         return "CF_WAVE";
-    case CF_UNICODETEXT:  return "CF_UNICODETEXT(";
+    case CF_UNICODETEXT:  return "CF_UNICODETEXT";
     case CF_ENHMETAFILE:  return "CF_ENHMETAFILE";
     case CF_HDROP:        return "CF_HDROP";
     case CF_LOCALE:       return "CF_LOCALE";
@@ -490,7 +490,7 @@ static const char *GetTymedName(DWORD tymed)
     case TYMED_ISTREAM:   return "TYMED_ISTREAM";
     case TYMED_ISTORAGE:  return "TYMED_ISTORAGE";
     case TYMED_GDI:       return "TYMED_GDI";
-    case TYMED_MFPICT:    return "TYMED_MFPICT(";
+    case TYMED_MFPICT:    return "TYMED_MFPICT";
     case TYMED_ENHMF:     return "TYMED_ENHMF";
     default:
       sprintf(s_szBuf, "type of media format %d (unknown)", tymed);

diff --git a/src/msw/penwin.cpp b/src/msw/penwin.cpp
index b9223a74f7cff43e8de6f0b73011b33fb50a2be5..3545a28bda121ec4711dc05465e3f37e254c9879 100644 (file)
--- a/src/msw/penwin.cpp
+++ b/src/msw/penwin.cpp
@@ -94,7 +94,7 @@ void wxRegisterPenWin(void)
 ///////////////////////////////////////////////////////////////////////
 // If running on a Pen Windows system, register this app so all
 // EDIT controls in dialogs are replaced by HEDIT controls.
-// (Notice the CONTROL statement in the RC file is "EDIT(",
+// (Notice the CONTROL statement in the RC file is "EDIT",
 // RegisterPenApp will automatically change that control to
 // an HEDIT.
   if ((g_hPenWin = (HANDLE)GetSystemMetrics(SM_PENWINDOWS)) != (HANDLE)NULL) {

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index c2f748e6db4801e62428d9305bc9380b4c8e3da9..50481be38306a5a7c1d8a585bf3770c6c631775c 100644 (file)
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -67,7 +67,7 @@ static struct
 }
 aStdKeys[] = 
 { 
-  { HKEY_CLASSES_ROOT,      T("HKEY_CLASSES_ROOT("),      T("HKCR") },
+  { HKEY_CLASSES_ROOT,      T("HKEY_CLASSES_ROOT"),      T("HKCR") },
 #ifdef  __WIN32__
   { HKEY_CURRENT_USER,      T("HKEY_CURRENT_USER"),      T("HKCU") },
   { HKEY_LOCAL_MACHINE,     T("HKEY_LOCAL_MACHINE"),     T("HKLM") },

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index dea366f0626a189d0d7c4434cf1a44cb289b8649..0b25964bb4c0f1e2442923673fd24edc74fd9b56 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -260,7 +260,7 @@ void wxTextCtrl::AdoptAttributesFromHWND()
 
   GetClassName(hWnd, buf, WXSIZEOF(buf));
 
-  if ( wxStricmp(buf, T("EDIT(")) == 0 )
+  if ( wxStricmp(buf, T("EDIT")) == 0 )
     m_isRich = FALSE;
   else
     m_isRich = TRUE;

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 4cd05cfd2f11b90499560bc27e08d20cb1cc54b9..2e72e79b926ac4da49c98a5fb400a903b441743b 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -3618,13 +3618,13 @@ const char *wxGetMessageName(int message)
         case 0x0008: return "WM_KILLFOCUS";
         case 0x000A: return "WM_ENABLE";
         case 0x000B: return "WM_SETREDRAW";
-        case 0x000C: return "WM_SETTEXT(";
-        case 0x000D: return "WM_GETTEXT(";
+        case 0x000C: return "WM_SETTEXT";
+        case 0x000D: return "WM_GETTEXT";
         case 0x000E: return "WM_GETTEXTLENGTH";
-        case 0x000F: return "WM_PAINT(";
+        case 0x000F: return "WM_PAINT";
         case 0x0010: return "WM_CLOSE";
         case 0x0011: return "WM_QUERYENDSESSION";
-        case 0x0012: return "WM_QUIT(";
+        case 0x0012: return "WM_QUIT";
         case 0x0013: return "WM_QUERYOPEN";
         case 0x0014: return "WM_ERASEBKGND";
         case 0x0015: return "WM_SYSCOLORCHANGE";
@@ -3652,8 +3652,8 @@ const char *wxGetMessageName(int message)
         case 0x002D: return "WM_DELETEITEM";
         case 0x002E: return "WM_VKEYTOITEM";
         case 0x002F: return "WM_CHARTOITEM";
-        case 0x0030: return "WM_SETFONT(";
-        case 0x0031: return "WM_GETFONT(";
+        case 0x0030: return "WM_SETFONT";
+        case 0x0031: return "WM_GETFONT";
         case 0x0037: return "WM_QUERYDRAGICON";
         case 0x0039: return "WM_COMPAREITEM";
         case 0x0041: return "WM_COMPACTING";
@@ -3666,12 +3666,12 @@ const char *wxGetMessageName(int message)
         case 0x004A: return "WM_COPYDATA";
         case 0x004B: return "WM_CANCELJOURNAL";
         case 0x004E: return "WM_NOTIFY";
-        case 0x0050: return "WM_INPUTLANGCHANGEREQUEST(";
+        case 0x0050: return "WM_INPUTLANGCHANGEREQUEST";
         case 0x0051: return "WM_INPUTLANGCHANGE";
         case 0x0052: return "WM_TCARD";
         case 0x0053: return "WM_HELP";
         case 0x0054: return "WM_USERCHANGED";
-        case 0x0055: return "WM_NOTIFYFORMAT(";
+        case 0x0055: return "WM_NOTIFYFORMAT";
         case 0x007B: return "WM_CONTEXTMENU";
         case 0x007C: return "WM_STYLECHANGING";
         case 0x007D: return "WM_STYLECHANGED";
@@ -3683,8 +3683,8 @@ const char *wxGetMessageName(int message)
         case 0x0081: return "WM_NCCREATE";
         case 0x0082: return "WM_NCDESTROY";
         case 0x0083: return "WM_NCCALCSIZE";
-        case 0x0084: return "WM_NCHITTEST(";
-        case 0x0085: return "WM_NCPAINT(";
+        case 0x0084: return "WM_NCHITTEST";
+        case 0x0085: return "WM_NCPAINT";
         case 0x0086: return "WM_NCACTIVATE";
         case 0x0087: return "WM_GETDLGCODE";
         case 0x00A0: return "WM_NCMOUSEMOVE";
@@ -3705,7 +3705,7 @@ const char *wxGetMessageName(int message)
         case 0x0105: return "WM_SYSKEYUP";
         case 0x0106: return "WM_SYSCHAR";
         case 0x0107: return "WM_SYSDEADCHAR";
-        case 0x0108: return "WM_KEYLAST(";
+        case 0x0108: return "WM_KEYLAST";
 
 #ifdef  __WIN32__
         case 0x010D: return "WM_IME_STARTCOMPOSITION";
@@ -3721,7 +3721,7 @@ const char *wxGetMessageName(int message)
         case 0x0115: return "WM_VSCROLL";
         case 0x0116: return "WM_INITMENU";
         case 0x0117: return "WM_INITMENUPOPUP";
-        case 0x011F: return "WM_MENUSELECT(";
+        case 0x011F: return "WM_MENUSELECT";
         case 0x0120: return "WM_MENUCHAR";
         case 0x0121: return "WM_ENTERIDLE";
         case 0x0200: return "WM_MOUSEMOVE";
@@ -3743,7 +3743,7 @@ const char *wxGetMessageName(int message)
         case 0x0214: return "WM_SIZING";
         case 0x0215: return "WM_CAPTURECHANGED";
         case 0x0216: return "WM_MOVING";
-        case 0x0218: return "WM_POWERBROADCAST(";
+        case 0x0218: return "WM_POWERBROADCAST";
         case 0x0219: return "WM_DEVICECHANGE";
 #endif  //WIN32
 
@@ -3751,7 +3751,7 @@ const char *wxGetMessageName(int message)
         case 0x0221: return "WM_MDIDESTROY";
         case 0x0222: return "WM_MDIACTIVATE";
         case 0x0223: return "WM_MDIRESTORE";
-        case 0x0224: return "WM_MDINEXT(";
+        case 0x0224: return "WM_MDINEXT";
         case 0x0225: return "WM_MDIMAXIMIZE";
         case 0x0226: return "WM_MDITILE";
         case 0x0227: return "WM_MDICASCADE";
@@ -3761,22 +3761,22 @@ const char *wxGetMessageName(int message)
         case 0x0233: return "WM_DROPFILES";
 
 #ifdef  __WIN32__
-        case 0x0281: return "WM_IME_SETCONTEXT(";
+        case 0x0281: return "WM_IME_SETCONTEXT";
         case 0x0282: return "WM_IME_NOTIFY";
         case 0x0283: return "WM_IME_CONTROL";
         case 0x0284: return "WM_IME_COMPOSITIONFULL";
-        case 0x0285: return "WM_IME_SELECT(";
+        case 0x0285: return "WM_IME_SELECT";
         case 0x0286: return "WM_IME_CHAR";
         case 0x0290: return "WM_IME_KEYDOWN";
         case 0x0291: return "WM_IME_KEYUP";
 #endif  //WIN32
 
-        case 0x0300: return "WM_CUT(";
+        case 0x0300: return "WM_CUT";
         case 0x0301: return "WM_COPY";
         case 0x0302: return "WM_PASTE";
         case 0x0303: return "WM_CLEAR";
         case 0x0304: return "WM_UNDO";
-        case 0x0305: return "WM_RENDERFORMAT(";
+        case 0x0305: return "WM_RENDERFORMAT";
         case 0x0306: return "WM_RENDERALLFORMATS";
         case 0x0307: return "WM_DESTROYCLIPBOARD";
         case 0x0308: return "WM_DRAWCLIPBOARD";
@@ -3797,9 +3797,9 @@ const char *wxGetMessageName(int message)
         // listview
         case 0x1000 + 0: return "LVM_GETBKCOLOR";
         case 0x1000 + 1: return "LVM_SETBKCOLOR";
-        case 0x1000 + 2: return "LVM_GETIMAGELIST(";
-        case 0x1000 + 3: return "LVM_SETIMAGELIST(";
-        case 0x1000 + 4: return "LVM_GETITEMCOUNT(";
+        case 0x1000 + 2: return "LVM_GETIMAGELIST";
+        case 0x1000 + 3: return "LVM_SETIMAGELIST";
+        case 0x1000 + 4: return "LVM_GETITEMCOUNT";
         case 0x1000 + 5: return "LVM_GETITEMA";
         case 0x1000 + 75: return "LVM_GETITEMW";
         case 0x1000 + 6: return "LVM_SETITEMA";
@@ -3813,12 +3813,12 @@ const char *wxGetMessageName(int message)
         case 0x1000 + 12: return "LVM_GETNEXTITEM";
         case 0x1000 + 13: return "LVM_FINDITEMA";
         case 0x1000 + 83: return "LVM_FINDITEMW";
-        case 0x1000 + 14: return "LVM_GETITEMRECT(";
+        case 0x1000 + 14: return "LVM_GETITEMRECT";
         case 0x1000 + 15: return "LVM_SETITEMPOSITION";
         case 0x1000 + 16: return "LVM_GETITEMPOSITION";
         case 0x1000 + 17: return "LVM_GETSTRINGWIDTHA";
         case 0x1000 + 87: return "LVM_GETSTRINGWIDTHW";
-        case 0x1000 + 18: return "LVM_HITTEST(";
+        case 0x1000 + 18: return "LVM_HITTEST";
         case 0x1000 + 19: return "LVM_ENSUREVISIBLE";
         case 0x1000 + 20: return "LVM_SCROLL";
         case 0x1000 + 21: return "LVM_REDRAWITEMS";
@@ -3837,7 +3837,7 @@ const char *wxGetMessageName(int message)
         case 0x1000 + 30: return "LVM_SETCOLUMNWIDTH";
         case 0x1000 + 31: return "LVM_GETHEADER";
         case 0x1000 + 33: return "LVM_CREATEDRAGIMAGE";
-        case 0x1000 + 34: return "LVM_GETVIEWRECT(";
+        case 0x1000 + 34: return "LVM_GETVIEWRECT";
         case 0x1000 + 35: return "LVM_GETTEXTCOLOR";
         case 0x1000 + 36: return "LVM_SETTEXTCOLOR";
         case 0x1000 + 37: return "LVM_GETTEXTBKCOLOR";
@@ -3852,25 +3852,25 @@ const char *wxGetMessageName(int message)
         case 0x1000 + 115: return "LVM_GETITEMTEXTW";
         case 0x1000 + 46: return "LVM_SETITEMTEXTA";
         case 0x1000 + 116: return "LVM_SETITEMTEXTW";
-        case 0x1000 + 47: return "LVM_SETITEMCOUNT(";
+        case 0x1000 + 47: return "LVM_SETITEMCOUNT";
         case 0x1000 + 48: return "LVM_SORTITEMS";
         case 0x1000 + 49: return "LVM_SETITEMPOSITION32";
-        case 0x1000 + 50: return "LVM_GETSELECTEDCOUNT(";
+        case 0x1000 + 50: return "LVM_GETSELECTEDCOUNT";
         case 0x1000 + 51: return "LVM_GETITEMSPACING";
         case 0x1000 + 52: return "LVM_GETISEARCHSTRINGA";
         case 0x1000 + 117: return "LVM_GETISEARCHSTRINGW";
         case 0x1000 + 53: return "LVM_SETICONSPACING";
         case 0x1000 + 54: return "LVM_SETEXTENDEDLISTVIEWSTYLE";
         case 0x1000 + 55: return "LVM_GETEXTENDEDLISTVIEWSTYLE";
-        case 0x1000 + 56: return "LVM_GETSUBITEMRECT(";
-        case 0x1000 + 57: return "LVM_SUBITEMHITTEST(";
+        case 0x1000 + 56: return "LVM_GETSUBITEMRECT";
+        case 0x1000 + 57: return "LVM_SUBITEMHITTEST";
         case 0x1000 + 58: return "LVM_SETCOLUMNORDERARRAY";
         case 0x1000 + 59: return "LVM_GETCOLUMNORDERARRAY";
         case 0x1000 + 60: return "LVM_SETHOTITEM";
         case 0x1000 + 61: return "LVM_GETHOTITEM";
         case 0x1000 + 62: return "LVM_SETHOTCURSOR";
         case 0x1000 + 63: return "LVM_GETHOTCURSOR";
-        case 0x1000 + 64: return "LVM_APPROXIMATEVIEWRECT(";
+        case 0x1000 + 64: return "LVM_APPROXIMATEVIEWRECT";
         case 0x1000 + 65: return "LVM_SETWORKAREA";
 
         // tree view
@@ -3878,12 +3878,12 @@ const char *wxGetMessageName(int message)
         case 0x1100 + 50: return "TVM_INSERTITEMW";
         case 0x1100 + 1: return "TVM_DELETEITEM";
         case 0x1100 + 2: return "TVM_EXPAND";
-        case 0x1100 + 4: return "TVM_GETITEMRECT(";
-        case 0x1100 + 5: return "TVM_GETCOUNT(";
-        case 0x1100 + 6: return "TVM_GETINDENT(";
-        case 0x1100 + 7: return "TVM_SETINDENT(";
-        case 0x1100 + 8: return "TVM_GETIMAGELIST(";
-        case 0x1100 + 9: return "TVM_SETIMAGELIST(";
+        case 0x1100 + 4: return "TVM_GETITEMRECT";
+        case 0x1100 + 5: return "TVM_GETCOUNT";
+        case 0x1100 + 6: return "TVM_GETINDENT";
+        case 0x1100 + 7: return "TVM_SETINDENT";
+        case 0x1100 + 8: return "TVM_GETIMAGELIST";
+        case 0x1100 + 9: return "TVM_SETIMAGELIST";
         case 0x1100 + 10: return "TVM_GETNEXTITEM";
         case 0x1100 + 11: return "TVM_SELECTITEM";
         case 0x1100 + 12: return "TVM_GETITEMA";
@@ -3893,8 +3893,8 @@ const char *wxGetMessageName(int message)
         case 0x1100 + 14: return "TVM_EDITLABELA";
         case 0x1100 + 65: return "TVM_EDITLABELW";
         case 0x1100 + 15: return "TVM_GETEDITCONTROL";
-        case 0x1100 + 16: return "TVM_GETVISIBLECOUNT(";
-        case 0x1100 + 17: return "TVM_HITTEST(";
+        case 0x1100 + 16: return "TVM_GETVISIBLECOUNT";
+        case 0x1100 + 17: return "TVM_HITTEST";
         case 0x1100 + 18: return "TVM_CREATEDRAGIMAGE";
         case 0x1100 + 19: return "TVM_SORTCHILDREN";
         case 0x1100 + 20: return "TVM_ENSUREVISIBLE";
@@ -3906,7 +3906,7 @@ const char *wxGetMessageName(int message)
         case 0x1100 + 25: return "TVM_GETTOOLTIPS";
 
         // header
-        case 0x1200 + 0: return "HDM_GETITEMCOUNT(";
+        case 0x1200 + 0: return "HDM_GETITEMCOUNT";
         case 0x1200 + 1: return "HDM_INSERTITEMA";
         case 0x1200 + 10: return "HDM_INSERTITEMW";
         case 0x1200 + 2: return "HDM_DELETEITEM";
@@ -3914,11 +3914,11 @@ const char *wxGetMessageName(int message)
         case 0x1200 + 11: return "HDM_GETITEMW";
         case 0x1200 + 4: return "HDM_SETITEMA";
         case 0x1200 + 12: return "HDM_SETITEMW";
-        case 0x1200 + 5: return "HDM_LAYOUT(";
-        case 0x1200 + 6: return "HDM_HITTEST(";
-        case 0x1200 + 7: return "HDM_GETITEMRECT(";
-        case 0x1200 + 8: return "HDM_SETIMAGELIST(";
-        case 0x1200 + 9: return "HDM_GETIMAGELIST(";
+        case 0x1200 + 5: return "HDM_LAYOUT";
+        case 0x1200 + 6: return "HDM_HITTEST";
+        case 0x1200 + 7: return "HDM_GETITEMRECT";
+        case 0x1200 + 8: return "HDM_SETIMAGELIST";
+        case 0x1200 + 9: return "HDM_GETIMAGELIST";
         case 0x1200 + 15: return "HDM_ORDERTOINDEX";
         case 0x1200 + 16: return "HDM_CREATEDRAGIMAGE";
         case 0x1200 + 17: return "HDM_GETORDERARRAY";
@@ -3926,9 +3926,9 @@ const char *wxGetMessageName(int message)
         case 0x1200 + 19: return "HDM_SETHOTDIVIDER";
 
         // tab control
-        case 0x1300 + 2: return "TCM_GETIMAGELIST(";
-        case 0x1300 + 3: return "TCM_SETIMAGELIST(";
-        case 0x1300 + 4: return "TCM_GETITEMCOUNT(";
+        case 0x1300 + 2: return "TCM_GETIMAGELIST";
+        case 0x1300 + 3: return "TCM_SETIMAGELIST";
+        case 0x1300 + 4: return "TCM_GETITEMCOUNT";
         case 0x1300 + 5: return "TCM_GETITEMA";
         case 0x1300 + 60: return "TCM_GETITEMW";
         case 0x1300 + 6: return "TCM_SETITEMA";
@@ -3937,16 +3937,16 @@ const char *wxGetMessageName(int message)
         case 0x1300 + 62: return "TCM_INSERTITEMW";
         case 0x1300 + 8: return "TCM_DELETEITEM";
         case 0x1300 + 9: return "TCM_DELETEALLITEMS";
-        case 0x1300 + 10: return "TCM_GETITEMRECT(";
+        case 0x1300 + 10: return "TCM_GETITEMRECT";
         case 0x1300 + 11: return "TCM_GETCURSEL";
         case 0x1300 + 12: return "TCM_SETCURSEL";
-        case 0x1300 + 13: return "TCM_HITTEST(";
+        case 0x1300 + 13: return "TCM_HITTEST";
         case 0x1300 + 14: return "TCM_SETITEMEXTRA";
-        case 0x1300 + 40: return "TCM_ADJUSTRECT(";
+        case 0x1300 + 40: return "TCM_ADJUSTRECT";
         case 0x1300 + 41: return "TCM_SETITEMSIZE";
         case 0x1300 + 42: return "TCM_REMOVEIMAGE";
         case 0x1300 + 43: return "TCM_SETPADDING";
-        case 0x1300 + 44: return "TCM_GETROWCOUNT(";
+        case 0x1300 + 44: return "TCM_GETROWCOUNT";
         case 0x1300 + 45: return "TCM_GETTOOLTIPS";
         case 0x1300 + 46: return "TCM_SETTOOLTIPS";
         case 0x1300 + 47: return "TCM_GETCURFOCUS";
@@ -3972,21 +3972,21 @@ const char *wxGetMessageName(int message)
         case WM_USER+21: return "TB_INSERTBUTTON";
         case WM_USER+22: return "TB_DELETEBUTTON";
         case WM_USER+23: return "TB_GETBUTTON";
-        case WM_USER+24: return "TB_BUTTONCOUNT(";
+        case WM_USER+24: return "TB_BUTTONCOUNT";
         case WM_USER+25: return "TB_COMMANDTOINDEX";
         case WM_USER+26: return "TB_SAVERESTOREA";
         case WM_USER+76: return "TB_SAVERESTOREW";
         case WM_USER+27: return "TB_CUSTOMIZE";
         case WM_USER+28: return "TB_ADDSTRINGA";
         case WM_USER+77: return "TB_ADDSTRINGW";
-        case WM_USER+29: return "TB_GETITEMRECT(";
+        case WM_USER+29: return "TB_GETITEMRECT";
         case WM_USER+30: return "TB_BUTTONSTRUCTSIZE";
         case WM_USER+31: return "TB_SETBUTTONSIZE";
         case WM_USER+32: return "TB_SETBITMAPSIZE";
         case WM_USER+33: return "TB_AUTOSIZE";
         case WM_USER+35: return "TB_GETTOOLTIPS";
         case WM_USER+36: return "TB_SETTOOLTIPS";
-        case WM_USER+37: return "TB_SETPARENT(";
+        case WM_USER+37: return "TB_SETPARENT";
         case WM_USER+39: return "TB_SETROWS";
         case WM_USER+40: return "TB_GETROWS";
         case WM_USER+42: return "TB_SETCMDID";
@@ -3995,15 +3995,15 @@ const char *wxGetMessageName(int message)
         case WM_USER+45: return "TB_GETBUTTONTEXTA";
         case WM_USER+75: return "TB_GETBUTTONTEXTW";
         case WM_USER+46: return "TB_REPLACEBITMAP";
-        case WM_USER+47: return "TB_SETINDENT(";
-        case WM_USER+48: return "TB_SETIMAGELIST(";
-        case WM_USER+49: return "TB_GETIMAGELIST(";
+        case WM_USER+47: return "TB_SETINDENT";
+        case WM_USER+48: return "TB_SETIMAGELIST";
+        case WM_USER+49: return "TB_GETIMAGELIST";
         case WM_USER+50: return "TB_LOADIMAGES";
-        case WM_USER+51: return "TB_GETRECT(";
-        case WM_USER+52: return "TB_SETHOTIMAGELIST(";
-        case WM_USER+53: return "TB_GETHOTIMAGELIST(";
-        case WM_USER+54: return "TB_SETDISABLEDIMAGELIST(";
-        case WM_USER+55: return "TB_GETDISABLEDIMAGELIST(";
+        case WM_USER+51: return "TB_GETRECT";
+        case WM_USER+52: return "TB_SETHOTIMAGELIST";
+        case WM_USER+53: return "TB_GETHOTIMAGELIST";
+        case WM_USER+54: return "TB_SETDISABLEDIMAGELIST";
+        case WM_USER+55: return "TB_GETDISABLEDIMAGELIST";
         case WM_USER+56: return "TB_SETSTYLE";
         case WM_USER+57: return "TB_GETSTYLE";
         case WM_USER+58: return "TB_GETBUTTONSIZE";