@Heidi ****
yes, it is always good when you enter Thailand coming from Cambodia, without a visa for Thailand, if you can show 20,000.- THB/ 40.000.- THB for a family, in cash (or equivalent in another currency) and proof of accomodation for the next 2 days and a proof of onward travel out of Thailand within the 30 days you will get stamped into Thailand . . .you CAN be asked or you won't be asked. It is up to the discretion of the Immigration officer. I would not worry too much. You will be fine, nobody will harass you at the border as you are a "normal" tourist who travels South East Asia with her son